CVS commit: pkgsrc/devel/glib2

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/glib2
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Sun, 16 Jun 2019 01:54:40 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Jun 16 01:54:40 UTC 2019

Modified Files:
        pkgsrc/devel/glib2: Makefile distinfo
        pkgsrc/devel/glib2/patches: patch-gio_meson.build
            patch-glib_meson.build patch-gobject_meson.build
Added Files:
        pkgsrc/devel/glib2/patches: patch-gmodule_meson.build
            patch-gthread_meson.build

Log Message:
Include rpath flags to ldflags, Bump PKGREVISION

This is workaround and should be fixed with more generic approach.
Outside pkgsrc, this may not work properly.


To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.244 -r1.245 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/glib2/patches/patch-gio_meson.build
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/glib2/patches/patch-glib_meson.build \
    pkgsrc/devel/glib2/patches/patch-gobject_meson.build
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/glib2/patches/patch-gmodule_meson.build \
    pkgsrc/devel/glib2/patches/patch-gthread_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/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.251 pkgsrc/devel/glib2/Makefile:1.252
--- pkgsrc/devel/glib2/Makefile:1.251   Tue Jun 11 09:15:54 2019
+++ pkgsrc/devel/glib2/Makefile Sun Jun 16 01:54:40 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.251 2019/06/11 09:15:54 prlw1 Exp $
+# $NetBSD: Makefile,v 1.252 2019/06/16 01:54:40 ryoon Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=   1
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
 

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.244 pkgsrc/devel/glib2/distinfo:1.245
--- pkgsrc/devel/glib2/distinfo:1.244   Tue Jun 11 09:15:54 2019
+++ pkgsrc/devel/glib2/distinfo Sun Jun 16 01:54:40 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.244 2019/06/11 09:15:54 prlw1 Exp $
+$NetBSD: distinfo,v 1.245 2019/06/16 01:54:40 ryoon Exp $
 
 SHA1 (glib-2.60.4.tar.xz) = f76ef7339fef5784d79520478110caa4c5054806
 RMD160 (glib-2.60.4.tar.xz) = e8520dd0da7c37e6bb18b24a3b3ec308a6fa6aa0
@@ -11,14 +11,16 @@ SHA1 (patch-gio_gresource-tool.c) = ad0e
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f23b84
-SHA1 (patch-gio_meson.build) = 745b0b2047537a16f0f4f5dd5eeaebf29844e8e1
+SHA1 (patch-gio_meson.build) = 6382404cda6ca64eac9d5ecee2fde02bd6d93af9
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
-SHA1 (patch-glib_meson.build) = 477cbc2324a81bb2a406487daef71cfc2140719c
+SHA1 (patch-glib_meson.build) = 50f7b7dd8e003d1dfd445ba0f515ba51d843e412
 SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8
 SHA1 (patch-gmodule_gmodule-dl.c) = b678a04debbc79ebb67d91db7716990658e76da4
 SHA1 (patch-gmodule_gmodule-dyld.c) = 5adf62970d9cff22d451307aaa0b00d975dab138
 SHA1 (patch-gmodule_gmodule-win32.c) = 477a861f8590a62c3dbc0aa4ad728cc86ebb34dd
 SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
+SHA1 (patch-gmodule_meson.build) = 23ab3a2e3bf460469b8a9ee2221b50b0953f7de1
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
-SHA1 (patch-gobject_meson.build) = 5e7c8508dbc228d01960e563bdba40cbf10db489
+SHA1 (patch-gobject_meson.build) = 611a04e63df509ae1dd1aa0d83e1e2fb6fe3629a
+SHA1 (patch-gthread_meson.build) = 0c58eaed83b8b29169760e5b811d35b509320549
 SHA1 (patch-meson.build) = b2e1139f4606870b117fd6ff35d7832b35ea1126

Index: pkgsrc/devel/glib2/patches/patch-gio_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.2 pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.3
--- pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.2        Wed Jun  5 08:57:15 2019
+++ pkgsrc/devel/glib2/patches/patch-gio_meson.build    Sun Jun 16 01:54:40 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-gio_meson.build,v 1.2 2019/06/05 08:57:15 jperkin Exp $
+$NetBSD: patch-gio_meson.build,v 1.3 2019/06/16 01:54:40 ryoon Exp $
 
 Don't build tests, as have strong dependency on libdl.
 Disable inotify on SunOS.
 
---- gio/meson.build.orig       2019-05-03 13:43:28.000000000 +0000
+--- gio/meson.build.orig       2019-06-10 17:47:20.000000000 +0000
 +++ gio/meson.build
 @@ -758,7 +758,7 @@ gioenumtypes_c = custom_target('gioenumt
  gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h])
@@ -14,7 +14,15 @@ Disable inotify on SunOS.
    subdir('inotify')
    internal_deps += [ inotify_lib ]
    internal_objects += [inotify_lib.extract_all_objects()]
-@@ -994,4 +994,3 @@ if enable_systemtap
+@@ -823,6 +823,7 @@ endif
+ schemas_subdir = join_paths('glib-2.0', 'schemas')
+ 
+ pkg.generate(libgio,
++  libraries : ['-Wl,-rpath${libdir}'],
+   libraries_private : [osx_ldflags],
+   requires : ['glib-2.0', 'gobject-2.0'],
+   variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
+@@ -994,4 +995,3 @@ if enable_systemtap
  endif
  
  subdir('fam')

Index: pkgsrc/devel/glib2/patches/patch-glib_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.1 pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.2
--- pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.1       Mon Jun  3 09:53:50 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_meson.build   Sun Jun 16 01:54:40 2019
@@ -1,11 +1,20 @@
-$NetBSD: patch-glib_meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+$NetBSD: patch-glib_meson.build,v 1.2 2019/06/16 01:54:40 ryoon Exp $
 
 - Don't bother with gtester as it's slated for deprecation anyway:
   https://gitlab.gnome.org/GNOME/glib/issues/1441
 - Don't build tests
 
---- glib/meson.build.orig      2019-04-15 10:54:04.000000000 +0000
+--- glib/meson.build.orig      2019-06-10 17:47:20.000000000 +0000
 +++ glib/meson.build
+@@ -284,7 +284,7 @@ libglib_dep = declare_dependency(
+   include_directories : [configinc, glibinc])
+ 
+ pkg.generate(libglib,
+-  libraries : [libintl],
++  libraries : [libintl, '-Wl,-rpath${libdir}'],
+   libraries_private : [osx_ldflags, win32_ldflags],
+   subdirs : ['glib-2.0'],
+   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
 @@ -324,24 +324,8 @@ if host_system == 'windows'
        include_directories : configinc,
        dependencies : [libglib_dep])
Index: pkgsrc/devel/glib2/patches/patch-gobject_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gobject_meson.build:1.1 pkgsrc/devel/glib2/patches/patch-gobject_meson.build:1.2
--- pkgsrc/devel/glib2/patches/patch-gobject_meson.build:1.1    Mon Jun  3 09:53:50 2019
+++ pkgsrc/devel/glib2/patches/patch-gobject_meson.build        Sun Jun 16 01:54:40 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-gobject_meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+$NetBSD: patch-gobject_meson.build,v 1.2 2019/06/16 01:54:40 ryoon Exp $
 
 Leave glib-genmarshal and glib-mkenums to devel/glib2-tools.
  
---- gobject/meson.build.orig   2019-04-15 10:54:04.000000000 +0000
+--- gobject/meson.build.orig   2019-06-10 17:47:20.000000000 +0000
 +++ gobject/meson.build
 @@ -75,7 +75,7 @@ foreach tool: python_tools
      input : tool + '.in',
@@ -13,3 +13,11 @@ Leave glib-genmarshal and glib-mkenums t
      install_dir : glib_bindir,
    )
  
+@@ -132,6 +132,7 @@ libgobject = library('gobject-2.0',
+ )
+ 
+ pkg.generate(libgobject,
++  libraries: ['-Wl,-rpath${libdir}'],
+   requires : ['glib-2.0'],
+   version : glib_version,
+   install_dir : glib_pkgconfigreldir,

Added files:

Index: pkgsrc/devel/glib2/patches/patch-gmodule_meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gmodule_meson.build:1.1
--- /dev/null   Sun Jun 16 01:54:40 2019
+++ pkgsrc/devel/glib2/patches/patch-gmodule_meson.build        Sun Jun 16 01:54:40 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-gmodule_meson.build,v 1.1 2019/06/16 01:54:40 ryoon Exp $
+
+--- gmodule/meson.build.orig   2019-06-10 17:47:20.000000000 +0000
++++ gmodule/meson.build
+@@ -110,7 +110,7 @@ libgmodule = library('gmodule-2.0',
+ supported_var = 'gmodule_supported=@0@'.format(g_module_impl != '0')
+ 
+ pkg.generate(libgmodule,
+-  libraries : [thread_dep],
++  libraries : [thread_dep, '-Wl,-rpath${libdir}'],
+   requires : ['glib-2.0'],
+   version : glib_version,
+   variables : [supported_var],
Index: pkgsrc/devel/glib2/patches/patch-gthread_meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gthread_meson.build:1.1
--- /dev/null   Sun Jun 16 01:54:40 2019
+++ pkgsrc/devel/glib2/patches/patch-gthread_meson.build        Sun Jun 16 01:54:40 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-gthread_meson.build,v 1.1 2019/06/16 01:54:40 ryoon Exp $
+
+--- gthread/meson.build.orig   2019-06-10 17:47:20.000000000 +0000
++++ gthread/meson.build
+@@ -24,7 +24,7 @@ libgthread = library('gthread-2.0',
+ )
+ 
+ pkg.generate(libgthread,
+-  libraries : [thread_dep],
++  libraries : [thread_dep, '-Wl,-rpath${libdir}'],
+   requires : ['glib-2.0'],
+   version : glib_version,
+   install_dir : glib_pkgconfigreldir,

Follow-Ups:
- Re: CVS commit: pkgsrc/devel/glib2
  - From: Leonardo Taccari
- Re: CVS commit: pkgsrc/devel/glib2
  - From: Adam

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: Re: CVS commit: pkgsrc/devel/glib2
Indexes:

Home | Main Index | Thread Index | Old Index