commit libnotify for openSUSE:Factory
Hello community, here is the log from the commit of package libnotify for openSUSE:Factory checked in at 2019-05-03 22:11:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnotify (Old) and /work/SRC/openSUSE:Factory/.libnotify.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnotify" Fri May 3 22:11:59 2019 rev:39 rq:695701 version:0.7.8 Changes: -------- --- /work/SRC/openSUSE:Factory/libnotify/libnotify.changes 2018-03-05 13:33:32.961298031 +0100 +++ /work/SRC/openSUSE:Factory/.libnotify.new.5148/libnotify.changes 2019-05-03 22:12:00.811462302 +0200 @@ -1,0 +2,12 @@ +Fri Apr 05 19:26:17 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 0.7.8: + + Support meson build system. + + notify-send: Support full URLs as hint values. + + Mic. bug fixes. +- Update _service file to new gitlab home. +- Add meson BuildRequires and macros. +- Drop gnome-common BuildRequires and autogen call, no longer + needed. + +------------------------------------------------------------------- Old: ---- libnotify-0.7.7+20170717.43aac61.tar.xz New: ---- libnotify-0.7.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnotify.spec ++++++ --- /var/tmp/diff_new_pack.ZqseRc/_old 2019-05-03 22:12:01.415463459 +0200 +++ /var/tmp/diff_new_pack.ZqseRc/_new 2019-05-03 22:12:01.415463459 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnotify # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libnotify -Version: 0.7.7+20170717.43aac61 +Version: 0.7.8 Release: 0 Summary: Notifications Library License: LGPL-2.1-or-later @@ -27,9 +27,10 @@ Source: %{name}-%{version}.tar.xz Source98: libnotify-rpmlintrc Source99: baselibs.conf -BuildRequires: gnome-common + BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) @@ -78,19 +79,19 @@ D-BUS notifications library. %prep -%autosetup +%autosetup -p1 %build -NOCONFIGURE=1 ./autogen.sh -%configure \ - --enable-gtk-doc \ - --disable-static \ +%meson \ + -Dtests=false \ + -Dintrospection=enabled \ + -Dgtk_doc=true \ + -Ddocbook_docs=disabled \ %{nil} -%make_build +%meson_build %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +%meson_install %post -n libnotify4 -p /sbin/ldconfig %postun -n libnotify4 -p /sbin/ldconfig ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ZqseRc/_old 2019-05-03 22:12:01.435463497 +0200 +++ /var/tmp/diff_new_pack.ZqseRc/_new 2019-05-03 22:12:01.435463497 +0200 @@ -1,9 +1,9 @@ <services> <service mode="disabled" name="tar_scm"> - <param name="url">git://git.gnome.org/libnotify</param> + <param name="url">https://gitlab.gnome.org/GNOME/libnotify.git</param> <param name="scm">git</param> - <param name="versionformat">0.7.7+%cd.%h</param> - <param name="revision">43aac613f1c2a56aa672c36c157c9b8eb193ac25</param> + <param name="versionformat">@PARENT_TAG@</param> + <param name="revision">0.7.8</param> <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="recompress"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ZqseRc/_old 2019-05-03 22:12:01.447463520 +0200 +++ /var/tmp/diff_new_pack.ZqseRc/_new 2019-05-03 22:12:01.451463527 +0200 @@ -1,4 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://git.gnome.org/libnotify</param> - <param name="changesrevision">43aac613f1c2a56aa672c36c157c9b8eb193ac25</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">43aac613f1c2a56aa672c36c157c9b8eb193ac25</param></service><service name="tar_scm"> + <param name="url">https://gitlab.gnome.org/GNOME/libnotify.git</param> + <param name="changesrevision">44f92222124b12987406d0768e760ecf9f7e27f8</param></service></servicedata> \ No newline at end of file ++++++ libnotify-0.7.7+20170717.43aac61.tar.xz -> libnotify-0.7.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/.gitlab-ci.yml new/libnotify-0.7.8/.gitlab-ci.yml --- old/libnotify-0.7.7+20170717.43aac61/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/.gitlab-ci.yml 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,42 @@ +stages: + - build + +.base_build_template: &base_build + stage: build + image: ubuntu:devel + +.ubuntu_deps_install_template: &ubuntu_deps_install + apt-get update && + apt-get install -q -y --no-install-recommends + gobject-introspection + gtk-doc-tools + libgdk-pixbuf2.0-dev + libgirepository1.0-dev + libglib2.0-dev + libgtk-3-dev + libpopt-dev + xmlto + +build:ubuntu:autogen: + <<: *base_build + before_script: + - *ubuntu_deps_install + - apt-get install -q -y --no-install-recommends + gnome-common + script: + - ./autogen.sh --enable-gtk-doc=yes + - make + - make distcheck + +build:ubuntu:meson: + <<: *base_build + before_script: + - *ubuntu_deps_install + - apt-get install -q -y --no-install-recommends + ninja-build + python3-pip + python3-setuptools + - pip3 install meson + script: + - meson _build -Dgtk_doc=true -Ddocbook_docs=enabled -Dtests=true + - ninja -C _build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/NEWS new/libnotify-0.7.8/NEWS --- old/libnotify-0.7.7+20170717.43aac61/NEWS 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/NEWS 2019-03-28 19:24:26.000000000 +0100 @@ -1,3 +1,13 @@ +New in 0.7.8 +============ +* Support meson build system [Marco; !3] +* notify-send: Support full URLs as hint values [Marco; !4] +* Mic. bug fixes [Ting-Wei, Florian; #760438, !8] + +Contributors: + Emmanuele Bassi, Abderrahim Kitouni, Ting-Wei Lan, Iain Lane, Florian Müllner, + Jan Tojnar, Marco Trevisan (Treviño), Marco Trevisan + New in 0.7.7 ============ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/config.h.meson new/libnotify-0.7.8/config.h.meson --- old/libnotify-0.7.7+20170717.43aac61/config.h.meson 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/config.h.meson 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,4 @@ +/* config.h.meson */ + +/* Version number of package */ +#mesondefine VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/configure.ac new/libnotify-0.7.8/configure.ac --- old/libnotify-0.7.7+20170717.43aac61/configure.ac 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/configure.ac 2019-03-28 19:24:26.000000000 +0100 @@ -4,8 +4,8 @@ dnl # Initialize autoconf dnl ################################################################ AC_INIT([libnotify], - [0.7.7], - [https://bugzilla.gnome.org/enter_bug.cgi?product=libnotify], + [0.7.8], + [https://gitlab.gnome.org/GNOME/libnotify/issues], [libnotify]) AC_PREREQ([2.63]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/Makefile.am new/libnotify-0.7.8/docs/Makefile.am --- old/libnotify-0.7.7+20170717.43aac61/docs/Makefile.am 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/docs/Makefile.am 2019-03-28 19:24:26.000000000 +0100 @@ -3,6 +3,7 @@ SUBDIRS = reference SPEC_XML_FILES = \ + config.xsl \ notification-spec.xml \ $(NULL) @@ -12,7 +13,7 @@ htmldoc_DATA = notification-spec.html notification-spec.html: $(SPEC_XML_FILES) - $(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks -m $(top_srcdir)/docs/config.xsl notification-spec.xml + $(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks -m config.xsl notification-spec.xml endif # DOCBOOK_DOCS_ENABLED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/meson.build new/libnotify-0.7.8/docs/meson.build --- old/libnotify-0.7.7+20170717.43aac61/docs/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/docs/meson.build 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,27 @@ +docbook_docs = get_option('docbook_docs') +if not docbook_docs.disabled() + xmlto = find_program('xmlto', required: docbook_docs.enabled()) + + if xmlto.found() + spec_files = ['notification-spec'] + + foreach spec: spec_files + custom_target(spec + '.html', + output: spec + '.html', + input: spec + '.xml', + depend_files: 'config.xsl', + command: [xmlto, + 'xhtml-nochunks', + '-m', join_paths(meson.current_source_dir(), 'config.xsl'), + '-o', '@OUTDIR@', + '@INPUT@' + ], + install: true, + install_dir: join_paths(docdir, 'spec')) + endforeach + endif +endif + +if get_option('gtk_doc') + subdir('reference') +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/notification-spec.xml new/libnotify-0.7.8/docs/notification-spec.xml --- old/libnotify-0.7.7+20170717.43aac61/docs/notification-spec.xml 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/docs/notification-spec.xml 2019-03-28 19:24:26.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <article id="index"> <articleinfo> <title>Desktop Notifications Specification</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/reference/meson.build new/libnotify-0.7.8/docs/reference/meson.build --- old/libnotify-0.7.7+20170717.43aac61/docs/reference/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/docs/reference/meson.build 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,10 @@ +gnome.gtkdoc(meson.project_name(), + mode: 'sgml', + main_sgml: meson.project_name() + '-docs.sgml', + src_dir: join_paths(meson.source_root(), meson.project_name()), + dependencies: libnotify_dep, + gobject_typesfile: meson.project_name() + '.types', + ignore_headers: ['notify-enum-types.h', 'notify-marshal.h', 'internal.h'], + scan_args: [ '--deprecated-guards=LIBNOTIFY_DISABLE_DEPRECATED' ], + install: true, +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.3.xml new/libnotify-0.7.8/docs/releases/notification-spec-0.3.xml --- old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.3.xml 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/docs/releases/notification-spec-0.3.xml 2019-03-28 19:24:26.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <article id="index"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.4.xml new/libnotify-0.7.8/docs/releases/notification-spec-0.4.xml --- old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.4.xml 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/docs/releases/notification-spec-0.4.xml 2019-03-28 19:24:26.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <article id="index"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.6.xml new/libnotify-0.7.8/docs/releases/notification-spec-0.6.xml --- old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.6.xml 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/docs/releases/notification-spec-0.6.xml 2019-03-28 19:24:26.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <article id="index"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.7.xml new/libnotify-0.7.8/docs/releases/notification-spec-0.7.xml --- old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.7.xml 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/docs/releases/notification-spec-0.7.xml 2019-03-28 19:24:26.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <article id="index"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.9.xml new/libnotify-0.7.8/docs/releases/notification-spec-0.9.xml --- old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-0.9.xml 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/docs/releases/notification-spec-0.9.xml 2019-03-28 19:24:26.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <article id="index"> <articleinfo> <title>Desktop Notifications Specification</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-1.0.xml new/libnotify-0.7.8/docs/releases/notification-spec-1.0.xml --- old/libnotify-0.7.7+20170717.43aac61/docs/releases/notification-spec-1.0.xml 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/docs/releases/notification-spec-1.0.xml 2019-03-28 19:24:26.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> <article id="index"> <articleinfo> <title>Desktop Notifications Specification</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/libnotify/libnotify.map new/libnotify-0.7.8/libnotify/libnotify.map --- old/libnotify-0.7.7+20170717.43aac61/libnotify/libnotify.map 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/libnotify/libnotify.map 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,6 @@ +{ +global: + notify_*; +local: + *; +}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/libnotify/meson.build new/libnotify-0.7.8/libnotify/meson.build --- old/libnotify-0.7.7+20170717.43aac61/libnotify/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/libnotify/meson.build 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,85 @@ +libnotify_includesubdir = meson.project_name() +libnotify_includedir = join_paths(includedir, libnotify_includesubdir) + +headers = [ + 'notify.h', + 'notification.h', +] + +sources = [ + 'notify.c', + 'notification.c', +] + +features_data = configuration_data() +features_data.set('LIBNOTIFY_MAJOR_VERSION', VERSION_ARRAY[0]) +features_data.set('LIBNOTIFY_MINOR_VERSION', VERSION_ARRAY[1]) +features_data.set('LIBNOTIFY_MICRO_VERSION', VERSION_ARRAY[2]) + +headers += configure_file( + input: 'notify-features.h.in', + output: 'notify-features.h', + configuration: features_data) + +enum_types = gnome.mkenums_simple('@0@-enum-types'.format(LIBNAME), + sources : headers, + install_header: true, + install_dir: libnotify_includedir +) + +marshal = gnome.genmarshal('@0@-marshal'.format(LIBNAME), + prefix: '@0@_marshal'.format(LIBNAME), + sources: '@0@-marshal.list'.format(LIBNAME), +) + +libnotify_cflags = [ + '-DG_LOG_DOMAIN="libnotify"', +] + +mapfile = meson.project_name() + '.map' +libnotify_ldflags = [ + '-Wl,--version-script,'+join_paths(meson.current_source_dir(), mapfile), +] + +notify_dep = declare_dependency( + include_directories: default_includes, + dependencies: libnotify_deps, + compile_args: libnotify_cflags, + sources: headers + [enum_types[1]] + [marshal[1]], + link_args: libnotify_ldflags, +) + +libnotify_lib = shared_library(LIBNAME, + dependencies: notify_dep, + sources: sources + enum_types + marshal, + version: '@0@.@1@.@2@'.format(LT_CURRENT, LT_REVISION, LT_AGE), + soversion: LT_CURRENT, + install: true, +) + +libnotify_dep = declare_dependency( + dependencies: notify_dep, + link_with: libnotify_lib +) + +pkgconfig.generate(libnotify_lib, + name: meson.project_name(), + libraries: libnotify_deps, + description: 'Notifications Library', +) + +introspection = get_option('introspection') +if not introspection.disabled() + find_program('g-ir-scanner', required: introspection.enabled()) + gnome.generate_gir(libnotify_lib, + sources: headers + sources + enum_types, + namespace: 'Notify', + nsversion: MODULE_VERSION, + export_packages: meson.project_name(), + includes: ['GLib-2.0', 'GdkPixbuf-2.0'], + extra_args: '--c-include=@0@/@1@.h'.format(meson.project_name(), LIBNAME), + install: true + ) +endif + +install_headers(headers, subdir: libnotify_includesubdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/meson.build new/libnotify-0.7.8/meson.build --- old/libnotify-0.7.7+20170717.43aac61/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/meson.build 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,58 @@ +project('libnotify', + 'c', + version: '0.7.8', + meson_version: '>= 0.47.0') + +gnome = import('gnome') +pkgconfig = import('pkgconfig') + +################################################################ +# libtool versioning +################################################################ +# +# +1 : 0 : +1 == new interface that does not break old one. +# +1 : 0 : 0 == removed an interface. Breaks old apps. +# ? : +1 : ? == internal changes that doesn't break anything. +# +# CURRENT : REVISION : AGE +# +LT_CURRENT=4 +LT_REVISION=0 +LT_AGE=0 + +VERSION_ARRAY = meson.project_version().split('.') +MODULE_VERSION = '@0@.@1@'.format(VERSION_ARRAY[0], VERSION_ARRAY[1]) +LIBNAME = meson.project_name().split('lib')[1] + +default_includes = include_directories('.') + +prefix = get_option('prefix') +includedir = join_paths(prefix, get_option('includedir')) +docdir = join_paths(prefix, get_option('datadir'), 'doc', meson.project_name()) + +libnotify_deps = [] +extra_deps = [] + +glib_req_version = '>= 2.26.0' + +gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') +glib_dep = dependency('glib-2.0', version: glib_req_version) +gio_dep = dependency('gio-2.0', version: glib_req_version) +gtk_dep = dependency('gtk+-3.0', version: '>= 2.90', required: get_option('tests')) + +libnotify_deps = [gdk_pixbuf_dep, gio_dep, glib_dep] +tests_deps = [gtk_dep] + +conf = configuration_data() +conf.set_quoted('VERSION', meson.project_version()) +configure_file(input: 'config.h.meson', + output : 'config.h', + configuration : conf) + +subdir('libnotify') +subdir('tools') +subdir('docs') + +if get_option('tests') + subdir('tests') +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/meson_options.txt new/libnotify-0.7.8/meson_options.txt --- old/libnotify-0.7.7+20170717.43aac61/meson_options.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/meson_options.txt 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,16 @@ +option('tests', + type: 'boolean', + value: true, + description: 'Build tests') +option('introspection', + type: 'feature', + value: 'enabled', + description: 'Enable GObject introspection') +option('gtk_doc', + type: 'boolean', + value: true, + description: 'Enable generating the API reference (depends on GTK-Doc)') +option('docbook_docs', + type: 'feature', + value: 'auto', + description: 'Build DocBook documentation (requires xmlto)') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/tests/meson.build new/libnotify-0.7.8/tests/meson.build --- old/libnotify-0.7.7+20170717.43aac61/tests/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/tests/meson.build 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,28 @@ +test_progs = [ + 'replace', + 'replace-widget', + 'server-info', + 'default-action', + 'multi-actions', + 'action-icons', + 'image', + 'basic', + 'error', + 'markup', + 'persistence', + 'removal', + 'resident', + 'rtl', + 'size-changes', + 'transient', + 'urgency', + 'xy', + 'xy-actions', + 'xy-stress', +] + +foreach tprog: test_progs + executable('test-' + tprog, ['test-' + tprog + '.c'], + dependencies: [libnotify_dep, tests_deps], + ) +endforeach diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/tools/meson.build new/libnotify-0.7.8/tools/meson.build --- old/libnotify-0.7.7+20170717.43aac61/tools/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libnotify-0.7.8/tools/meson.build 2019-03-28 19:24:26.000000000 +0100 @@ -0,0 +1,7 @@ +progs = ['notify-send'] + +foreach prog: progs + executable(prog, [prog + '.c'], + dependencies: libnotify_dep, + install: true) +endforeach diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnotify-0.7.7+20170717.43aac61/tools/notify-send.c new/libnotify-0.7.8/tools/notify-send.c --- old/libnotify-0.7.7+20170717.43aac61/tools/notify-send.c 2017-07-17 11:16:06.000000000 +0200 +++ new/libnotify-0.7.8/tools/notify-send.c 2019-03-28 19:24:26.000000000 +0100 @@ -246,7 +246,7 @@ char **tokens = NULL; while ((hint = hints[i++])) { - tokens = g_strsplit (hint, ":", -1); + tokens = g_strsplit (hint, ":", 3); l = g_strv_length (tokens); if (l != 3) {
participants (1)
-
root