cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to glib2-2.26.1.

Browse Source 
Amongst other things, fixes an issue with GSettings on big endian.
This commit is contained in:
ajacoutot 2010-11-14 15:56:55 +00:00
parent c7f74edae6
commit 6d0633ffce
12 changed files with 47 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/glib2/Makefile
View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.99 2010/11/07 17:00:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.100 2010/11/14 15:56:55 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.26.0
VERSION= 2.26.1
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 1
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/

10
devel/glib2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (glib-2.26.0.tar.bz2) = m33GH144nhz/J3pjUMNzlw==
RMD160 (glib-2.26.0.tar.bz2) = F2RBlE8kwnQ5iQOuGBbuz+LP82s=
SHA1 (glib-2.26.0.tar.bz2) = nX6dzirdP63DUHmtKRqU9F689wY=
SHA256 (glib-2.26.0.tar.bz2) = TBjjqttbIKzHwPfTp32oooQ7han9c/06o2CnrqlT47I=
SIZE (glib-2.26.0.tar.bz2) = 6632632
MD5 (glib-2.26.1.tar.bz2) = F1NazM7vVbyxenTXP5wq7w==
RMD160 (glib-2.26.1.tar.bz2) = 6LAPzlWqU57gBYhQDAFiqId9wGA=
SHA1 (glib-2.26.1.tar.bz2) = jTXVz0HWgd1kgKFr4599PP+9KfA=
SHA256 (glib-2.26.1.tar.bz2) = enT/Era53uHy0OUgtWtotiGSDE9CUL3yNGjlFWJcKNU=
SIZE (glib-2.26.1.tar.bz2) = 6704686

8
devel/glib2/patches/patch-docs_reference_glib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.8 2010/09/30 07:17:19 ajacoutot Exp $
--- docs/reference/glib/Makefile.in.orig Sat Sep 18 21:28:23 2010
+++ docs/reference/glib/Makefile.in Mon Sep 27 14:42:36 2010
@@ -446,8 +446,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.9 2010/11/14 15:56:55 ajacoutot Exp $
--- docs/reference/glib/Makefile.in.orig Sun Nov 14 07:01:53 2010
+++ docs/reference/glib/Makefile.in Sun Nov 14 16:14:34 2010
@@ -447,8 +447,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
########################################################################
man_MANS = \
glib-gettextize.1 \

8
devel/glib2/patches/patch-gio_tests_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gio_tests_Makefile_in,v 1.1 2010/10/11 20:41:44 kili Exp $
--- gio/tests/Makefile.in.orig Mon Sep 27 18:10:12 2010
+++ gio/tests/Makefile.in Sun Oct 10 14:41:18 2010
@@ -1538,7 +1538,7 @@ test: test-nonrecursive
$OpenBSD: patch-gio_tests_Makefile_in,v 1.2 2010/11/14 15:56:55 ajacoutot Exp $
--- gio/tests/Makefile.in.orig Sun Nov 14 07:01:57 2010
+++ gio/tests/Makefile.in Sun Nov 14 16:14:34 2010
@@ -1548,7 +1548,7 @@ test: test-nonrecursive
# test-nonrecursive: run tests only in cwd
test-nonrecursive: ${TEST_PROGS}

12
devel/glib2/patches/patch-glib_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-glib_Makefile_in,v 1.19 2010/09/30 07:17:19 ajacoutot Exp $
$OpenBSD: patch-glib_Makefile_in,v 1.20 2010/11/14 15:56:55 ajacoutot Exp $
Don't install gtester-report, it'll only pull in python.
--- glib/Makefile.in.orig Mon Sep 27 18:10:13 2010
+++ glib/Makefile.in Mon Sep 27 18:44:45 2010
@@ -777,7 +777,7 @@ INSTALL_PROGS = $(am__append_5) $(am__append_6) $(am__
--- glib/Makefile.in.orig Sun Nov 14 07:01:58 2010
+++ glib/Makefile.in Sun Nov 14 16:14:34 2010
@@ -778,7 +778,7 @@ INSTALL_PROGS = $(am__append_5) $(am__append_6) $(am__
@OS_WIN32_TRUE@@OS_WIN32_X64_FALSE@gspawn_win32_helper_console_LDADD = libglib-2.0.la
@OS_UNIX_TRUE@gtester_SOURCES = gtester.c
@OS_UNIX_TRUE@gtester_LDADD = libglib-2.0.la
@ -13,7 +13,7 @@ Don't install gtester-report, it'll only pull in python.
@OS_UNIX_TRUE@bin_SCRIPTS = ${auto_config_binscripts}
@OS_UNIX_TRUE@CONFIGVARS = \
@OS_UNIX_TRUE@ "bindir" : "${bindir}", \
@@ -1539,7 +1539,7 @@ info: info-recursive
@@ -1540,7 +1540,7 @@ info: info-recursive
info-am:
@ -22,7 +22,7 @@ Don't install gtester-report, it'll only pull in python.
install-glibincludeHEADERS install-glibsubincludeHEADERS \
install-tapsetDATA
@$(NORMAL_INSTALL)
@@ -1793,9 +1793,7 @@ distclean-local:
@@ -1794,9 +1794,7 @@ distclean-local:
libglib-gdb.py: libglib-gdb.py.in
$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py

8
devel/glib2/patches/patch-glib_tests_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_tests_Makefile_in,v 1.1 2010/10/11 20:41:44 kili Exp $
--- glib/tests/Makefile.in.orig Mon Sep 27 18:10:13 2010
+++ glib/tests/Makefile.in Sun Oct 10 14:41:23 2010
@@ -1027,7 +1027,7 @@ test: test-nonrecursive
$OpenBSD: patch-glib_tests_Makefile_in,v 1.2 2010/11/14 15:56:55 ajacoutot Exp $
--- glib/tests/Makefile.in.orig Sun Nov 14 07:02:00 2010
+++ glib/tests/Makefile.in Sun Nov 14 16:14:34 2010
@@ -1028,7 +1028,7 @@ test: test-nonrecursive
# test-nonrecursive: run tests only in cwd
test-nonrecursive: ${TEST_PROGS}

10
devel/glib2/patches/patch-gobject_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gobject_Makefile_in,v 1.9 2010/09/30 07:17:19 ajacoutot Exp $
--- gobject/Makefile.in.orig Sat Sep 18 21:28:25 2010
+++ gobject/Makefile.in Mon Sep 27 14:43:10 2010
@@ -1243,7 +1243,7 @@ info: info-recursive
$OpenBSD: patch-gobject_Makefile_in,v 1.10 2010/11/14 15:56:55 ajacoutot Exp $
--- gobject/Makefile.in.orig Sun Nov 14 07:02:01 2010
+++ gobject/Makefile.in Sun Nov 14 16:14:34 2010
@@ -1244,7 +1244,7 @@ info: info-recursive
info-am:
@ -10,7 +10,7 @@ $OpenBSD: patch-gobject_Makefile_in,v 1.9 2010/09/30 07:17:19 ajacoutot Exp $
install-libgobjectincludeHEADERS install-tapsetDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -1488,9 +1488,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
@@ -1489,9 +1489,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
uninstall-gdb:
-rm -r $(DESTDIR)$(datadir)/gdb

8
devel/glib2/patches/patch-gobject_tests_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gobject_tests_Makefile_in,v 1.1 2010/10/11 20:41:44 kili Exp $
--- gobject/tests/Makefile.in.orig Mon Sep 27 18:10:13 2010
+++ gobject/tests/Makefile.in Sun Oct 10 14:41:27 2010
@@ -658,7 +658,7 @@ test: test-nonrecursive
$OpenBSD: patch-gobject_tests_Makefile_in,v 1.2 2010/11/14 15:56:55 ajacoutot Exp $
--- gobject/tests/Makefile.in.orig Sun Nov 14 07:02:01 2010
+++ gobject/tests/Makefile.in Sun Nov 14 16:14:34 2010
@@ -659,7 +659,7 @@ test: test-nonrecursive
# test-nonrecursive: run tests only in cwd
test-nonrecursive: ${TEST_PROGS}

8
devel/glib2/patches/patch-gthread_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gthread_Makefile_in,v 1.8 2010/10/11 20:41:44 kili Exp $
--- gthread/Makefile.in.orig Mon Sep 27 18:10:13 2010
+++ gthread/Makefile.in Sun Oct 10 14:41:31 2010
@@ -871,7 +871,7 @@ test: test-nonrecursive
$OpenBSD: patch-gthread_Makefile_in,v 1.9 2010/11/14 15:56:55 ajacoutot Exp $
--- gthread/Makefile.in.orig Sun Nov 14 07:02:02 2010
+++ gthread/Makefile.in Sun Nov 14 16:14:34 2010
@@ -872,7 +872,7 @@ test: test-nonrecursive
# test-nonrecursive: run tests only in cwd
test-nonrecursive: ${TEST_PROGS}

43
devel/glib2/patches/patch-m4macros_gsettings_m4
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-m4macros_gsettings_m4,v 1.2 2010/10/04 06:28:10 ajacoutot Exp $
From 136e705e8383ff8848e425ac01278102d7badc52 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 04 Oct 2010 05:51:11 +0000
Subject: Bug 627126 - gsettings schemas on FreeBSD
Rewrite the install rule for GSettings schemas to not depend on an
obscure chunk of non-portable sed that nobody understands the purpose
of.
Instead, use make's VPATH feature to resolve the paths of the files that
need to be installed. No need to depend on the .valid targets here
since automake already ensures that 'make all' is complete before 'make
install' is permitted to run.
--- m4macros/gsettings.m4.orig Mon Oct 4 08:16:50 2010
+++ m4macros/gsettings.m4 Mon Oct 4 08:17:51 2010
@@ -45,22 +45,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
-gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(gsettings__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
- done
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:

10
devel/glib2/patches/patch-tests_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_Makefile_in,v 1.17 2010/10/11 20:41:44 kili Exp $
--- tests/Makefile.in.orig Mon Sep 27 18:10:13 2010
+++ tests/Makefile.in Sun Oct 10 15:00:56 2010
@@ -639,8 +639,7 @@ test_programs = \
$OpenBSD: patch-tests_Makefile_in,v 1.18 2010/11/14 15:56:55 ajacoutot Exp $
--- tests/Makefile.in.orig Sun Nov 14 07:02:03 2010
+++ tests/Makefile.in Sun Nov 14 16:14:34 2010
@@ -640,8 +640,7 @@ test_programs = \
thread-test \
threadpool-test \
type-test \
@ -11,7 +11,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.17 2010/10/11 20:41:44 kili Exp $
test_scripts = run-collate-tests.sh run-assert-msg-test.sh
test_script_support_programs = unicode-collate
@@ -1403,7 +1402,7 @@ test: test-nonrecursive
@@ -1404,7 +1403,7 @@ test: test-nonrecursive
# test-nonrecursive: run tests only in cwd
test-nonrecursive: ${TEST_PROGS}

8
devel/glib2/patches/patch-tests_refcount_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.16 2010/09/30 07:17:19 ajacoutot Exp $
--- tests/refcount/Makefile.in.orig Sat Sep 18 21:28:26 2010
+++ tests/refcount/Makefile.in Mon Sep 27 14:42:37 2010
@@ -403,7 +403,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.17 2010/11/14 15:56:55 ajacoutot Exp $
--- tests/refcount/Makefile.in.orig Sun Nov 14 07:02:04 2010
+++ tests/refcount/Makefile.in Sun Nov 14 16:14:34 2010
@@ -404,7 +404,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
libgobject = $(top_builddir)/gobject/libgobject-2.0.la
LDADD = $(libglib) $(libgobject) $(libgthread) $(G_THREAD_LIBS)
test_programs = \