diff options
Diffstat (limited to 'sysutils/gnome-control-center/files')
6 files changed, 71 insertions, 41 deletions
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index 1f63c8a48..83ef8876c 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,13 +1,5 @@ --- configure.orig Wed Dec 18 16:10:09 2002 +++ configure Sun Dec 22 16:36:03 2002 -@@ -8516,6 +8516,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -12607,7 +12608,7 @@ diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in deleted file mode 100644 index e8984e700..000000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-settings-daemon/Makefile.in.orig Fri May 9 11:57:23 2003 -+++ gnome-settings-daemon/Makefile.in Fri May 9 11:57:49 2003 -@@ -160,7 +160,7 @@ - - # $(AccessX_files) - --gnome_settings_daemon_LDADD = $(GNOME_SETTINGS_DAEMON_LIBS) $(top_builddir)/libbackground/libbackground.la $(top_builddir)/libsounds/libsounds.a -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings $(XF86MISC_LIBS) -+gnome_settings_daemon_LDADD = $(GNOME_SETTINGS_DAEMON_LIBS) $(top_builddir)/libbackground/libbackground.la $(top_builddir)/libsounds/libsounds.a -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings $(XF86MISC_LIBS) - - - #AccessX_files = \ diff --git a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in deleted file mode 100644 index 3431fb5d4..000000000 --- a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libbackground/Makefile.in.orig Fri May 9 11:05:19 2003 -+++ libbackground/Makefile.in Fri May 9 11:05:45 2003 -@@ -151,7 +151,7 @@ - - EXTRA_DIST = ChangeLog - --INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ - - - noinst_LTLIBRARIES = libbackground.la diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in deleted file mode 100644 index 97ce0db1a..000000000 --- a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libwindow-settings/Makefile.in.orig Fri May 9 11:06:25 2003 -+++ libwindow-settings/Makefile.in Fri May 9 11:07:00 2003 -@@ -151,7 +151,7 @@ - - WM_MODULE_DIR = $(libdir)/window-manager-settings - --INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ -DMETACITY_THEME_DIR=\""$(datadir)/themes"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ -DMETACITY_THEME_DIR=\""$(datadir)/themes"\" - - - lib_LTLIBRARIES = libgnome-window-settings.la diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh new file mode 100644 index 000000000..8afc42e39 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Fri Apr 25 15:18:44 2003 ++++ ltmain.sh Sun May 11 02:27:13 2003 +@@ -1061,7 +1061,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1071,8 +1071,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2471,6 +2479,9 @@ + *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4280,10 +4291,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c new file mode 100644 index 000000000..45a72ff27 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c @@ -0,0 +1,20 @@ +--- vfs-methods/themus/theme-method.c.orig Thu May 22 01:42:21 2003 ++++ vfs-methods/themus/theme-method.c Thu May 22 01:44:13 2003 +@@ -19,6 +19,7 @@ + + #include <string.h> + #include <errno.h> ++#include <libintl.h> + #include <sys/stat.h> + #include <sys/types.h> + +@@ -528,8 +529,8 @@ + return GNOME_VFS_OK; + } + else { +- g_free (path); + GnomeThemeMetaInfo *theme; ++ g_free (path); + + theme = theme_meta_info_find (uri); + if (theme) |