diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-28 19:45:14 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-28 19:45:14 +0800 |
| commit | b9b358b47fd942e1e27ce4ef1b53adbe096232ed (patch) | |
| tree | f4bd50a9a66de6f8c350f3dcdef7e441553cd6d7 /devel/dconf/files | |
| parent | b2f437d63a9b9c09a6de1e4c39135274a43be14c (diff) | |
| download | marcuscom-ports-b9b358b47fd942e1e27ce4ef1b53adbe096232ed.tar marcuscom-ports-b9b358b47fd942e1e27ce4ef1b53adbe096232ed.tar.gz marcuscom-ports-b9b358b47fd942e1e27ce4ef1b53adbe096232ed.tar.bz2 marcuscom-ports-b9b358b47fd942e1e27ce4ef1b53adbe096232ed.tar.lz marcuscom-ports-b9b358b47fd942e1e27ce4ef1b53adbe096232ed.tar.xz marcuscom-ports-b9b358b47fd942e1e27ce4ef1b53adbe096232ed.tar.zst marcuscom-ports-b9b358b47fd942e1e27ce4ef1b53adbe096232ed.zip | |
UPdate to 0.12.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16818 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/dconf/files')
| -rw-r--r-- | devel/dconf/files/patch-client_Makefile.in | 15 | ||||
| -rw-r--r-- | devel/dconf/files/patch-dbus-1_Makefile.in | 21 |
2 files changed, 22 insertions, 14 deletions
diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in index 510f4aabe..d97d83186 100644 --- a/devel/dconf/files/patch-client_Makefile.in +++ b/devel/dconf/files/patch-client_Makefile.in @@ -1,5 +1,5 @@ ---- client/Makefile.in.orig 2011-01-18 11:48:50.000000000 +0000 -+++ client/Makefile.in 2011-01-18 11:50:05.000000000 +0000 +--- client/Makefile.in.orig 2012-05-28 13:27:17.000000000 +0200 ++++ client/Makefile.in 2012-05-28 13:31:25.000000000 +0200 @@ -34,7 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : @@ -9,20 +9,19 @@ subdir = client DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \ -@@ -320,9 +320,10 @@ +@@ -332,9 +332,10 @@ clean-shlibPROGRAMS: -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) --libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) -- @rm -f libdconf.so.0.0.0$(EXEEXT) -+libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) -+ @rm -f libdconf.so.0$(EXEEXT) +-libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) ++libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) + @rm -f libdconf.so.0.0.0$(EXEEXT) $(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS) + $(AM_V_GEN) ln -fs libdconf.so.0 libdconf.so mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -693,12 +694,8 @@ +@@ -695,12 +696,8 @@ uninstall-vapiDATA diff --git a/devel/dconf/files/patch-dbus-1_Makefile.in b/devel/dconf/files/patch-dbus-1_Makefile.in index 55d7ea73e..907188b52 100644 --- a/devel/dconf/files/patch-dbus-1_Makefile.in +++ b/devel/dconf/files/patch-dbus-1_Makefile.in @@ -1,5 +1,5 @@ ---- dbus-1/Makefile.in.orig 2011-01-18 11:47:14.000000000 +0000 -+++ dbus-1/Makefile.in 2011-01-18 11:47:14.000000000 +0000 +--- dbus-1/Makefile.in.orig 2012-05-28 13:31:56.000000000 +0200 ++++ dbus-1/Makefile.in 2012-05-28 13:35:25.000000000 +0200 @@ -34,7 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : @@ -9,20 +9,29 @@ subdir = dbus-1 DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in -@@ -310,9 +310,10 @@ +@@ -246,7 +246,7 @@ + ../gvdb/gvdb-reader.c \ + dconf-dbus-1.c + +-noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0 ++noinst_DATA = libdconf-dbus-1.so.0 + CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so + all: all-am + +@@ -321,9 +321,10 @@ clean-shlibPROGRAMS: -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) --libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) +-libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) - @rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT) -+libdconf-dbus-1.so.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) ++libdconf-dbus-1.so.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) + @rm -f libdconf-dbus-1.so.0$(EXEEXT) $(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS) + $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0 libdconf-dbus-1.so mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -636,12 +637,8 @@ +@@ -640,12 +641,8 @@ uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS |