diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch | 82 | ||||
| -rw-r--r-- | desktop/wmakerconf/wmakerconf.SlackBuild | 12 |
2 files changed, 89 insertions, 5 deletions
diff --git a/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch b/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch new file mode 100644 index 0000000000..5b598c3c15 --- /dev/null +++ b/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch @@ -0,0 +1,82 @@ +diff -Naur wmakerconf-2.12.orig/src/menu.c wmakerconf-2.12/src/menu.c +--- wmakerconf-2.12.orig/src/menu.c 2012-02-10 17:34:57.601475631 +0100 ++++ wmakerconf-2.12/src/menu.c 2012-02-10 17:35:03.917287748 +0100 +@@ -500,10 +500,10 @@ + * 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 (); +diff -Naur wmakerconf-2.12.orig/src/rootmenu.c wmakerconf-2.12/src/rootmenu.c +--- wmakerconf-2.12.orig/src/rootmenu.c 2012-02-10 17:34:57.601475631 +0100 ++++ wmakerconf-2.12/src/rootmenu.c 2012-02-10 17:35:03.929287391 +0100 +@@ -365,7 +365,7 @@ + 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); +diff -Naur wmakerconf-2.12.orig/src/themebrowser.c wmakerconf-2.12/src/themebrowser.c +--- wmakerconf-2.12.orig/src/themebrowser.c 2012-02-10 17:34:57.601475631 +0100 ++++ wmakerconf-2.12/src/themebrowser.c 2012-02-10 17:35:56.515722786 +0100 +@@ -2705,7 +2705,7 @@ + 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" +diff -Naur wmakerconf-2.12.orig/src/window.c wmakerconf-2.12/src/window.c +--- wmakerconf-2.12.orig/src/window.c 2012-02-10 17:34:57.601475631 +0100 ++++ wmakerconf-2.12/src/window.c 2012-02-10 17:35:03.953286677 +0100 +@@ -1069,7 +1069,7 @@ + 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."), +diff -Naur wmakerconf-2.12.orig/src/wmconfig.c wmakerconf-2.12/src/wmconfig.c +--- wmakerconf-2.12.orig/src/wmconfig.c 2012-02-10 17:34:57.601475631 +0100 ++++ wmakerconf-2.12/src/wmconfig.c 2012-02-10 17:35:03.957286559 +0100 +@@ -216,7 +216,7 @@ + /* + * 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 @@ + 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 @@ + /* + * 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); diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild index b6ea8d85fe..fd9dd541b1 100644 --- a/desktop/wmakerconf/wmakerconf.SlackBuild +++ b/desktop/wmakerconf/wmakerconf.SlackBuild @@ -7,7 +7,7 @@ PRGNAM=wmakerconf VERSION=${VERSION:-2.12} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: @@ -55,6 +55,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix for building over windowmaer >= 0.95.2 +# http://sourceforge.net/tracker/?func=detail&aid=3522083&group_id=196469&atid=957581 +patch -p1 < $CWD/wmakerconf-2.12-wmaker-0.95_support.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -73,10 +77,8 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ |