CVS commit: pkgsrc/devel/dconf

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 17 15:33:01 UTC 2018

Modified Files:
        pkgsrc/devel/dconf: distinfo
Added Files:
        pkgsrc/devel/dconf/patches: patch-client_meson.build
            patch-gsettings_meson.build

Log Message:
dconf: Work around link ordering issue on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/dconf/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/dconf/patches/patch-client_meson.build \
    pkgsrc/devel/dconf/patches/patch-gsettings_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/dconf/distinfo
diff -u pkgsrc/devel/dconf/distinfo:1.15 pkgsrc/devel/dconf/distinfo:1.16
--- pkgsrc/devel/dconf/distinfo:1.15    Fri Dec  7 20:02:58 2018
+++ pkgsrc/devel/dconf/distinfo Mon Dec 17 15:33:01 2018
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.15 2018/12/07 20:02:58 schmonz Exp $
+$NetBSD: distinfo,v 1.16 2018/12/17 15:33:01 jperkin Exp $
 
 SHA1 (dconf-0.30.1.tar.xz) = 181cdedc20a5ecd2d6e6aab4538ff199b5eaa1f9
 RMD160 (dconf-0.30.1.tar.xz) = c1b65608f36fd8f29a3e5204b95fc5afddd0affc
 SHA512 (dconf-0.30.1.tar.xz) = f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03
 Size (dconf-0.30.1.tar.xz) = 104376 bytes
+SHA1 (patch-client_meson.build) = c14f83a8577d35c8f32dfa3d9fcbbe1c9e67548b
+SHA1 (patch-gsettings_meson.build) = 63abfc31d9fede52340708739bc53a6f6a439108
 SHA1 (patch-meson.build) = 2015b184e88ed797b52152d00e96e45988cf01bf

Added files:

Index: pkgsrc/devel/dconf/patches/patch-client_meson.build
diff -u /dev/null pkgsrc/devel/dconf/patches/patch-client_meson.build:1.1
--- /dev/null   Mon Dec 17 15:33:01 2018
+++ pkgsrc/devel/dconf/patches/patch-client_meson.build Mon Dec 17 15:33:01 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-client_meson.build,v 1.1 2018/12/17 15:33:01 jperkin Exp $
+
+Fix link ordering.  https://gitlab.gnome.org/GNOME/dconf/issues/49
+
+--- client/meson.build.orig    2018-10-22 21:53:04.000000000 +0000
++++ client/meson.build
+@@ -38,6 +38,7 @@ libdconf = shared_library(
+   soversion: soversion,
+   include_directories: top_inc,
+   dependencies: deps,
++  link_with: libdconf_engine,
+   c_args: dconf_c_args,
+   install: true,
+ )
Index: pkgsrc/devel/dconf/patches/patch-gsettings_meson.build
diff -u /dev/null pkgsrc/devel/dconf/patches/patch-gsettings_meson.build:1.1
--- /dev/null   Mon Dec 17 15:33:01 2018
+++ pkgsrc/devel/dconf/patches/patch-gsettings_meson.build      Mon Dec 17 15:33:01 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-gsettings_meson.build,v 1.1 2018/12/17 15:33:01 jperkin Exp $
+
+Fix link ordering.  https://gitlab.gnome.org/GNOME/dconf/issues/49
+
+--- gsettings/meson.build.orig 2018-10-22 21:53:04.000000000 +0000
++++ gsettings/meson.build
+@@ -3,6 +3,7 @@
+ # symbols other than g_io_module_*
+ backend_deps = [
+   libdconf_common_hidden,
++  libdconf_engine,
+   libdconf_gdbus_thread,
+ ]
+