openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: glib 2.36.4 -> 2.38.1

master
Dr. Ralf S. Engelschall 12 years ago
parent
72240f8c66
commit
583c8a148f
2 changed files with 49 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 111
      glib/glib.patch
  2. 7
      glib/glib.spec

111
glib/glib.patch
Unescape View File

@ -1,61 +1,41 @@
Index: Makefile.in
--- Makefile.in.orig 2013-06-10 00:53:44.000000000 +0200
+++ Makefile.in 2013-06-10 17:51:01.834837748 +0200
@@ -94,8 +94,8 @@
$(srcdir)/README.in $(srcdir)/config.h.win32.in test-driver \
COPYING compile config.guess config.sub install-sh missing \
ltmain.sh
-@BUILD_MODULAR_TESTS_TRUE@am__append_1 = tests
-@BUILD_MODULAR_TESTS_FALSE@am__append_2 = tests
+@BUILD_MODULAR_TESTS_TRUE@am__append_1 =
+@BUILD_MODULAR_TESTS_FALSE@am__append_2 =
@OS_UNIX_TRUE@am__append_3 = gio-unix-2.0.pc
@OS_WIN32_TRUE@am__append_4 = gio-windows-2.0.pc
subdir = .
@@ -686,7 +686,7 @@
gio-unix-2.0.pc.in gio-windows-2.0.pc.in check-abis.sh
TEST_PROGS =
--- Makefile.in.orig 2013-10-15 21:14:50.000000000 +0200
+++ Makefile.in 2013-10-20 10:29:53.907825969 +0200
@@ -820,7 +820,7 @@
@ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs \
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po \
$(am__append_1)
DIST_SUBDIRS = $(SUBDIRS) build $(am__append_2)
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
AM_CPPFLAGS = \
Index: gio/Makefile.in
--- gio/Makefile.in.orig 2013-06-10 00:53:45.000000000 +0200
+++ gio/Makefile.in 2013-06-10 17:50:21.024847147 +0200
@@ -120,7 +120,7 @@
@OS_WIN32_TRUE@am__append_22 = gwin32appinfo.c gwin32appinfo.h
@OS_WIN32_TRUE@am__append_23 = -lshlwapi -lws2_32 -ldnsapi
-@BUILD_MODULAR_TESTS_TRUE@am__append_24 = tests
+@BUILD_MODULAR_TESTS_TRUE@am__append_24 =
# This is dumb. The ObjC source file should be properly named .m
@OS_COCOA_TRUE@am__append_25 = -xobjective-c
@@ -576,8 +576,8 @@
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \
- fam tests
+DIST_SUBDIRS = xdgmime inotify kqueue fen win32 . \
--- gio/Makefile.in.orig 2013-10-15 21:14:51.000000000 +0200
+++ gio/Makefile.in 2013-10-20 10:30:46.597786355 +0200
@@ -800,7 +800,7 @@
b='$*';; \
esac
DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \
- tests fam
+ fam
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -858,7 +858,7 @@
gnetworking.h.win32 $(NULL) $(completion_DATA)
TEST_PROGS =
NULL =
-SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
+SUBDIRS = $(am__append_1) $(am__append_4) \
$(am__append_7) $(am__append_11) $(am__append_14) . \
$(am__append_17) $(am__append_24)
@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
@@ -1173,8 +1173,8 @@
@ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts)
@ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \
- $(am__append_22) $(am__append_26) $(am__append_29) . tests \
+SUBDIRS = $(am__append_15) $(am__append_19) \
+ $(am__append_22) $(am__append_26) $(am__append_29) . \
$(am__append_32)
@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
Index: gio/glib-compile-schemas.c
--- gio/glib-compile-schemas.c.orig 2013-06-10 00:03:17.000000000 +0200
+++ gio/glib-compile-schemas.c 2013-06-10 17:50:21.024847147 +0200
--- gio/glib-compile-schemas.c.orig 2013-08-08 12:00:40.000000000 +0200
+++ gio/glib-compile-schemas.c 2013-10-20 10:29:04.017821164 +0200
@@ -1534,7 +1534,7 @@
}
/* Text {{{2 */
@ -75,20 +55,19 @@ Index: gio/glib-compile-schemas.c
const gchar *filename;
GError *error = NULL;
Index: gio/tests/gdbus-peer.c
--- gio/tests/gdbus-peer.c.orig 2013-06-10 00:03:17.000000000 +0200
+++ gio/tests/gdbus-peer.c 2013-06-10 17:50:21.024847147 +0200
@@ -39,6 +39,8 @@
#include <gio/gunixsocketaddress.h>
#include <gio/gunixfdlist.h>
--- gio/tests/gdbus-peer.c.orig 2013-10-15 21:07:46.000000000 +0200
+++ gio/tests/gdbus-peer.c 2013-10-20 10:31:04.238696024 +0200
@@ -29,6 +29,7 @@
/* for open(2) */
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/socket.h>
+
/* used in test_overflow */
#ifdef G_OS_UNIX
#include <gio/gunixconnection.h>
#include <fcntl.h>
#include <string.h>
Index: gio/xdgmime/xdgmimecache.h
--- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200
+++ gio/xdgmime/xdgmimecache.h 2013-06-10 17:50:21.024847147 +0200
--- gio/xdgmime/xdgmimecache.h.orig 2013-05-07 20:26:07.000000000 +0200
+++ gio/xdgmime/xdgmimecache.h 2013-10-20 10:29:04.017821164 +0200
@@ -46,6 +46,9 @@
#define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon)
#define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon)
@ -100,8 +79,8 @@ Index: gio/xdgmime/xdgmimecache.h
extern XdgMimeCache **_caches;
Index: glib/gatomic.c
--- glib/gatomic.c.orig 2013-06-10 00:03:17.000000000 +0200
+++ glib/gatomic.c 2013-06-10 17:50:21.024847147 +0200
--- glib/gatomic.c.orig 2013-08-08 12:00:40.000000000 +0200
+++ glib/gatomic.c 2013-10-20 10:29:04.017821164 +0200
@@ -21,6 +21,7 @@
#include "config.h"
@ -111,8 +90,8 @@ Index: glib/gatomic.c
/**
Index: gmodule/gmodule-dl.c
--- gmodule/gmodule-dl.c.orig 2013-06-10 00:03:18.000000000 +0200
+++ gmodule/gmodule-dl.c 2013-06-10 17:50:21.024847147 +0200
--- gmodule/gmodule-dl.c.orig 2013-08-08 12:00:40.000000000 +0200
+++ gmodule/gmodule-dl.c 2013-10-20 10:29:04.017821164 +0200
@@ -107,6 +107,7 @@
static gpointer
_g_module_self (void)
@ -121,7 +100,7 @@ Index: gmodule/gmodule-dl.c
gpointer handle;
/* to query symbols from the program itself, special link options
@@ -118,6 +119,9 @@
@@ -122,6 +123,9 @@
g_module_set_error (fetch_dlerror (TRUE));
return handle;

7
glib/glib.spec
Unescape View File

@ -22,8 +22,8 @@
##
# package version
%define V_major 2.36
%define V_minor 4
%define V_major 2.38
%define V_minor 1
# package information
Name: glib
@ -36,7 +36,7 @@ Class: BASE
Group: Algorithm
License: GPL
Version: %{V_major}.%{V_minor}
Release: 20130824
Release: 20131020
# package options
%option with_threads yes
@ -151,6 +151,7 @@ PreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/glib-2.0
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gdb
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/bash-completion
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm $RPM_BUILD_ROOT%{l_prefix}/lib/*.la

Write Preview
Loading…
Cancel
Save