Hello community, here is the log from the commit of package wmakerconf for openSUSE:Factory checked in at 2012-05-08 12:29:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wmakerconf (Old) and /work/SRC/openSUSE:Factory/.wmakerconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wmakerconf", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/wmakerconf/wmakerconf.changes 2011-12-26 16:30:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wmakerconf.new/wmakerconf.changes 2012-05-08 12:29:19.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 27 21:16:30 UTC 2012 - [email protected] + +- fix for sf#3488712 (fix build for new wmaker-0.95) + * add wmakerconf-2.12-wmaker-0.95_support.patch +- try to fix implicit-pointer-decl + * add implicit-pointer-decl patch +- rebase patches to be p0 +- some spec cleanup +- enable parallel build + +------------------------------------------------------------------- New: ---- wmakerconf-2.12-wmaker-0.95_support.patch wmakerconf-implicit-pointer-decl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wmakerconf.spec ++++++ --- /var/tmp/diff_new_pack.H7MU7p/_old 2012-05-08 12:29:21.000000000 +0200 +++ /var/tmp/diff_new_pack.H7MU7p/_new 2012-05-08 12:29:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wmakerconf # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,24 @@ Name: wmakerconf +Summary: Configuration tool for Window Maker +License: GPL-2.0+ +Group: System/GUI/Other +Version: 2.12 +Release: 0 +Url: http://wmakerconf.sourceforge.net/ +Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-2.9.dif +Patch1: %{name}-fix-bad-po.patch +Patch3: %{name}-2.9-destdir.patch +Patch4: %{name}-2.9-config.patch +Patch5: %{name}-no-imlib.patch +Patch7: %{name}-2.9-varargs.diff +Patch9: %{name}-datarootdir.patch +Patch10: %{name}-2.12-wmaker-0.95_support.patch +# PATCH - Fix SUSE: implicit-pointer-decl +Patch11: %{name}-implicit-pointer-decl.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: WindowMaker-devel BuildRequires: automake BuildRequires: fdupes @@ -27,40 +45,21 @@ Provides: wmaconf Requires: WindowMaker Requires: perl-libwww-perl -Summary: Configuration tool for Window Maker -License: GPL-2.0+ -Group: System/GUI/Other -Version: 2.12 -Release: 0 -Url: http://wmakerconf.sourceforge.net/ -Source: %{name}-%{version}.tar.bz2 -Patch: wmakerconf-2.9.dif -Patch1: wmakerconf-fix-bad-po.patch -Patch3: wmakerconf-2.9-destdir.patch -Patch4: wmakerconf-2.9-config.patch -Patch5: wmakerconf-no-imlib.patch -Patch7: wmakerconf-2.9-varargs.diff -Patch9: wmakerconf-datarootdir.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Wmakerconf is a GTK+ based configuration tool for Window Maker. - - -Authors: --------- - Ullrich Hafner <[email protected]> - %prep %setup -q -%patch -%patch1 -p1 +%patch0 +%patch1 %patch3 %patch4 -%patch5 -p1 +%patch5 %patch7 %patch9 +%patch10 +%patch11 # --------------------------------------------------------------------------- %build @@ -70,7 +69,7 @@ %configure \ --with-nlsdir=%{_datadir}/locale \ --with-pixmapdir=%{_datadir}/WindowMaker/Pixmaps -make +make %{?_smp_mflags} # --------------------------------------------------------------------------- %install ++++++ wmakerconf-2.12-wmaker-0.95_support.patch ++++++ Index: src/menu.c =================================================================== --- src/menu.c.orig +++ src/menu.c @@ -500,10 +500,10 @@ revert_and_exit (GtkWidget *w, gpointer * No return value. */ { - if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES)) + if (!WMWritePropListToFile(orig_wmaker, orig_wmaker_fname)) warning (_("Can't revert to backupfile of `WindowMaker'. " "Please manually revert from file WindowMaker.bak.")); - if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname, YES)) + if (orig_rootmenu && !WMWritePropListToFile(orig_rootmenu, orig_rootmenu_fname)) warning (_("Can't revert to backupfile of `WMRootMenu'. " "Please manually revert from file WMRootMenu.bak.")); gtk_main_quit (); Index: src/rootmenu.c =================================================================== --- src/rootmenu.c.orig +++ src/rootmenu.c @@ -365,7 +365,7 @@ save_rootmenu (void) node_freeitem, NULL); g_node_destroy (node); - if (WMWritePropListToFile (menu, filename, YES)) + if (WMWritePropListToFile(menu, filename)) { menu_changed = NO; message (_("Window Maker root menu file '%s' saved."), filename); Index: src/themebrowser.c =================================================================== --- src/themebrowser.c.orig +++ src/themebrowser.c @@ -2705,7 +2705,7 @@ save_theme_backend (GtkWidget *widget, g oldfiles = g_list_remove (oldfiles, tmp); Free (tmp); } - if (!WMWritePropListToFile (theme, stylename, YES)) + if (!WMWritePropListToFile(theme, stylename)) { dialog_popup (DIALOG_ERROR, NULL, NULL, _("Can't save theme file\n`%s'\n" Index: src/window.c =================================================================== --- src/window.c.orig +++ src/window.c @@ -1069,7 +1069,7 @@ save_config_file (GtkWidget *widget, gpo WMReleasePropList (all_keys); } - if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES)) + if (WMWritePropListToFile(newwm, orig_wmaker_fname)) { changed = NO; message (_("Window Maker config file '%s' saved."), Index: src/wmconfig.c =================================================================== --- src/wmconfig.c.orig +++ src/wmconfig.c @@ -216,7 +216,7 @@ main (int argc, char **argv) /* * Generate backup file "'path'.bak" */ - if (WMWritePropListToFile (orig_rootmenu, new, YES)) + if (WMWritePropListToFile(orig_rootmenu, new)) message (_("Backupfile `%s' generated."), new); else error (_("Can't write backupfile `%s'."), new); @@ -280,7 +280,7 @@ main (int argc, char **argv) if (!windowmaker) { windowmaker = global_windowmaker; - if (WMWritePropListToFile (windowmaker, orig_wmaker_fname, YES)) + if (WMWritePropListToFile(windowmaker, orig_wmaker_fname)) warning (_("New WindowMaker configuration file `%s' created."), orig_wmaker_fname); else @@ -294,7 +294,7 @@ main (int argc, char **argv) /* * Generate backup file "'path'.bak" */ - if (WMWritePropListToFile (windowmaker, new, YES)) + if (WMWritePropListToFile(windowmaker, new)) message (_("Backupfile `%s' generated."), new); else error (_("Can't write backupfile `%s'."), new); ++++++ wmakerconf-2.9-destdir.patch ++++++ --- /var/tmp/diff_new_pack.H7MU7p/_old 2012-05-08 12:29:21.000000000 +0200 +++ /var/tmp/diff_new_pack.H7MU7p/_new 2012-05-08 12:29:21.000000000 +0200 @@ -7,7 +7,7 @@ install-data-no: all install-data-yes: all - $(mkinstalldirs) $(datadir); -+ $(mkinstalldirs) $(DESTDIR)$(datadir); ++ $(mkinstalldirs) $(DESTDIR)$(datadir); @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ ++++++ wmakerconf-2.9-varargs.diff ++++++ --- /var/tmp/diff_new_pack.H7MU7p/_old 2012-05-08 12:29:21.000000000 +0200 +++ /var/tmp/diff_new_pack.H7MU7p/_new 2012-05-08 12:29:21.000000000 +0200 @@ -1,5 +1,7 @@ ---- src/error.c.ORG 2002-01-07 20:16:42.000000000 +0100 -+++ src/error.c 2003-04-29 16:41:49.000000000 +0200 +Index: src/error.c +=================================================================== +--- src/error.c.orig ++++ src/error.c @@ -38,11 +38,7 @@ #include <stdio.h> #include <gtk/gtk.h> ++++++ wmakerconf-2.9.dif ++++++ --- /var/tmp/diff_new_pack.H7MU7p/_old 2012-05-08 12:29:21.000000000 +0200 +++ /var/tmp/diff_new_pack.H7MU7p/_new 2012-05-08 12:29:21.000000000 +0200 @@ -1,12 +1,12 @@ ---- src/misc.c +Index: src/misc.c +=================================================================== +--- src/misc.c.orig +++ src/misc.c -@@ -587,10 +587,12 @@ - { +@@ -654,9 +654,11 @@ preview_name (const char *name) char *str = g_strdup (name); char *ptr, *path; -- + - for (ptr = str; *ptr; ptr++) -+ + if ( str != NULL ) { + for (ptr = str; *ptr; ptr++) if (*ptr == '/') ++++++ wmakerconf-fix-bad-po.patch ++++++ --- /var/tmp/diff_new_pack.H7MU7p/_old 2012-05-08 12:29:21.000000000 +0200 +++ /var/tmp/diff_new_pack.H7MU7p/_new 2012-05-08 12:29:21.000000000 +0200 @@ -1,7 +1,7 @@ -Index: wmakerconf-2.12/po/tr.po +Index: po/tr.po =================================================================== ---- wmakerconf-2.12.orig/po/tr.po -+++ wmakerconf-2.12/po/tr.po +--- po/tr.po.orig ++++ po/tr.po @@ -1411,35 +1411,35 @@ msgstr "Y�kleme �ndizinlemesi verilmemi� msgid "Skip" msgstr "Atla" ++++++ wmakerconf-implicit-pointer-decl.patch ++++++ Index: src/simple.c =================================================================== --- src/simple.c.orig +++ src/simple.c @@ -31,6 +31,9 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/socket.h> #include <gtk/gtk.h> #include "proplist_t.h" ++++++ wmakerconf-no-imlib.patch ++++++ --- /var/tmp/diff_new_pack.H7MU7p/_old 2012-05-08 12:29:21.000000000 +0200 +++ /var/tmp/diff_new_pack.H7MU7p/_new 2012-05-08 12:29:21.000000000 +0200 @@ -1,7 +1,7 @@ -Index: wmakerconf-2.12/configure.ac +Index: configure.ac =================================================================== ---- wmakerconf-2.12.orig/configure.ac -+++ wmakerconf-2.12/configure.ac +--- configure.ac.orig ++++ configure.ac @@ -175,12 +175,13 @@ AM_PATH_GTK_2_0(2.4.0,, AC_MSG_ERROR([*** GTK >= 2.4.0 not installed - please install first ***])) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
