summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2020-12-19 11:12:26 +0100
committer Matteo Bernardini2021-03-06 11:04:19 +0100
commit7af4f1e46f073551e1b437b485f1bb26c3d94f1b (patch)
treef77fd4bcb5e80ebdb8bc72ba8a7f2f6e30056225
parent3c59cb22425adf5d8a0d1a79baf00e6d9334c620 (diff)
downloadslackbuilds-wmakerconf.tar.gz
desktop/wmakerconf: Use (amended) freebsd patches, fix linking.wmakerconf
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--desktop/wmakerconf/patches/patch-configure38
-rw-r--r--desktop/wmakerconf/patches/patch-scripts__wget.pl9
-rw-r--r--desktop/wmakerconf/patches/patch-src_menu.c15
-rw-r--r--desktop/wmakerconf/patches/patch-src_misc.c14
-rw-r--r--desktop/wmakerconf/patches/patch-src_previews.c20
-rw-r--r--desktop/wmakerconf/patches/patch-src_rootmenu.c11
-rw-r--r--desktop/wmakerconf/patches/patch-src_themebrowser.c50
-rw-r--r--desktop/wmakerconf/patches/patch-src_window.c20
-rw-r--r--desktop/wmakerconf/patches/patch-src_wmconfig.c29
-rw-r--r--desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch82
-rw-r--r--desktop/wmakerconf/wmakerconf.SlackBuild19
11 files changed, 215 insertions, 92 deletions
diff --git a/desktop/wmakerconf/patches/patch-configure b/desktop/wmakerconf/patches/patch-configure
new file mode 100644
index 0000000000..c7dcb3cc6a
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig 2007-04-12 10:52:31 UTC
++++ configure
+@@ -3458,7 +3458,7 @@ fi
+ libwmfun="no"
+ # Checks for wraster lib
+ # Extract the first word of "get-wings-flags", so it can be a program name with args.
+-set dummy get-wings-flags; ac_word=$2
++set dummy pkg-config; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_wraster+set}" = set; then
+@@ -3486,7 +3486,7 @@ done
+ ;;
+ esac
+ fi
+-wraster=$ac_cv_path_wraster
++wraster="$ac_cv_path_wraster wrlib"
+
+ if test -n "$wraster"; then
+ echo "$as_me:$LINENO: result: $wraster" >&5
+@@ -3497,7 +3497,7 @@ echo "${ECHO_T}no" >&6
+ fi
+
+ if test -n "$wraster"; then
+- WRASTERLIBS=`($wraster --ldflags --libs 2>/dev/null || $wraster --lflags --libs) | xargs`
++ WRASTERLIBS=`$wraster --libs`
+ WRASTERINCLUDES=`$wraster --cflags`
+ MKPREVIEW="mkpreview"
+ OLD_LDFLAGS="$LDFLAGS"
+@@ -5818,7 +5818,7 @@ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- for ac_prog in lynx wget
++ for ac_prog in lynx fetch
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
diff --git a/desktop/wmakerconf/patches/patch-scripts__wget.pl b/desktop/wmakerconf/patches/patch-scripts__wget.pl
new file mode 100644
index 0000000000..1956f065fd
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-scripts__wget.pl
@@ -0,0 +1,9 @@
+--- scripts/wget.pl.orig Mon Jan 26 07:20:31 2004
++++ scripts/wget.pl Wed Jun 2 01:56:42 2004
+@@ -1,5 +1,5 @@
+ quit ("Wget not installed") if $wwwget eq "";
+
+-$rc = system ("$wwwget --quiet -c --tries=0 -O$tmpfile '$url'");
++$rc = system ("$wwwget --q -o $tmpfile '$url'");
+
+ quit ("HTTP response error.") if $rc;
diff --git a/desktop/wmakerconf/patches/patch-src_menu.c b/desktop/wmakerconf/patches/patch-src_menu.c
new file mode 100644
index 0000000000..99eb03f14b
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-src_menu.c
@@ -0,0 +1,15 @@
+--- src/menu.c.orig 2004-12-05 04:19:25.000000000 +0100
++++ src/menu.c 2020-12-19 10:50:15.292392000 +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 --git a/desktop/wmakerconf/patches/patch-src_misc.c b/desktop/wmakerconf/patches/patch-src_misc.c
new file mode 100644
index 0000000000..a83094e9b0
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-src_misc.c
@@ -0,0 +1,14 @@
+--- src/misc.c.orig 2004-12-05 01:49:32 UTC
++++ src/misc.c
+@@ -482,9 +482,9 @@ copy_file (const char *dst, const char *src)
+ if (dir) /* directory is destination */
+ {
+ closedir (dir);
+- if (streq (dst, g_dirname (src)))
++ if (streq (dst, g_path_get_dirname (src)))
+ return 0;
+- dst_name = g_strconcat (dst, "/", g_basename (src), NULL);
++ dst_name = g_strconcat (dst, "/", g_path_get_basename (src), NULL);
+ }
+ else
+ dst_name = g_strdup (dst);
diff --git a/desktop/wmakerconf/patches/patch-src_previews.c b/desktop/wmakerconf/patches/patch-src_previews.c
new file mode 100644
index 0000000000..19a949b906
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-src_previews.c
@@ -0,0 +1,20 @@
+--- src/previews.c.orig 2004-12-07 00:37:10 UTC
++++ src/previews.c
+@@ -326,7 +326,7 @@ make_preview (GtkWidget *entry, char *name)
+ Free (pname);
+ }
+
+- gtk_tooltips_set_tip (tooltips, data->button, g_basename (name), NULL);
++ gtk_tooltips_set_tip (tooltips, data->button, g_path_get_basename (name), NULL);
+ gtk_container_set_border_width (GTK_CONTAINER (data->button), 2);
+ gtk_container_add (GTK_CONTAINER (data->button), pixmap);
+ gtk_widget_show_all (data->button);
+@@ -344,7 +344,7 @@ set_selection (GtkWidget *widget, GdkEventButton *even
+ GtkWidget *entry = gtk_object_get_user_data (GTK_OBJECT (pixmap));
+ previewdata_t *data = (previewdata_t *) ptr;
+
+- gtk_entry_set_text (GTK_ENTRY (entry), g_basename (data->name));
++ gtk_entry_set_text (GTK_ENTRY (entry), g_path_get_basename (data->name));
+
+ if (event->type == GDK_2BUTTON_PRESS)
+ gtk_signal_emit_by_name (GTK_OBJECT (ok_button), "clicked");
diff --git a/desktop/wmakerconf/patches/patch-src_rootmenu.c b/desktop/wmakerconf/patches/patch-src_rootmenu.c
new file mode 100644
index 0000000000..ecfd417b8f
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-src_rootmenu.c
@@ -0,0 +1,11 @@
+--- src/rootmenu.c.orig 2005-02-26 15:31:26.000000000 +0100
++++ src/rootmenu.c 2020-12-19 11:01:13.863392000 +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 --git a/desktop/wmakerconf/patches/patch-src_themebrowser.c b/desktop/wmakerconf/patches/patch-src_themebrowser.c
new file mode 100644
index 0000000000..be409657b4
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-src_themebrowser.c
@@ -0,0 +1,50 @@
+--- src/themebrowser.c.orig 2007-04-12 10:38:44 UTC
++++ src/themebrowser.c
+@@ -917,7 +917,7 @@ append_directory (const char *dirname, GtkCTree *tree,
+ GtkCTreeNode *rootsibling = NULL;
+
+ if (parent)
+- root = append_node ((char *) g_basename (dirname), tree, parent,
++ root = append_node ((char *) g_path_get_basename (dirname), tree, parent,
+ sibling, NO);
+ else
+ root = append_node ((char *) dirname, tree, parent, sibling, NO);
+@@ -2284,7 +2284,7 @@ leave_preview (GtkWidget *button, gpointer ptr)
+ g_list_length (list) > 1
+ ? _("Show next preview")
+ : _("Leave preview mode"), NULL, leave_preview, list,
+- _("Preview of `%s'"), g_basename (name));
++ _("Preview of `%s'"), g_path_get_basename (name));
+ }
+ }
+
+@@ -2705,7 +2705,7 @@ save_theme_backend (GtkWidget *widget, gpointer ptr)
+ 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"
+@@ -3526,17 +3526,17 @@ compute_preview (GtkWidget *progress_bar, GtkWidget *p
+ path = get_pixmap_path (pname);
+
+ gtk_progress_bar_update (GTK_PROGRESS_BAR (progress_bar), n / (double) nelem);
+- gtk_label_set_text (GTK_LABEL (progress_label), g_basename (name));
++ gtk_label_set_text (GTK_LABEL (progress_label), g_path_get_basename (name));
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+
+ if (!path)
+ {
+- DIR *dir = opendir (g_dirname (pname));
++ DIR *dir = opendir (g_path_get_dirname (pname));
+
+ if (!dir) /* Make ~/.wmakerconf directory */
+ {
+- if (make_directory (g_dirname (pname)))
++ if (make_directory (g_path_get_dirname (pname)))
+ {
+ Free (pname);
+ return;
diff --git a/desktop/wmakerconf/patches/patch-src_window.c b/desktop/wmakerconf/patches/patch-src_window.c
new file mode 100644
index 0000000000..9ab84dc4c5
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-src_window.c
@@ -0,0 +1,20 @@
+--- src/window.c.orig 2004-07-22 03:09:55 UTC
++++ src/window.c
+@@ -898,7 +898,7 @@ make_pixmap (const char *name, int width, int height,
+ gdk_imlib_render (image, max (width, 22), max (height, 22));
+ pixmap = gdk_imlib_move_image (image);
+ mask = gdk_imlib_move_mask (image);
+- if (strchr (g_basename (path), '.')) /* don't cache x-of-day */
++ if (strchr (g_path_get_basename (path), '.')) /* don't cache x-of-day */
+ gdk_imlib_destroy_image (image);
+ else
+ gdk_imlib_kill_image (image);
+@@ -1069,7 +1069,7 @@ save_config_file (GtkWidget *widget, gpointer ptr)
+ 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 --git a/desktop/wmakerconf/patches/patch-src_wmconfig.c b/desktop/wmakerconf/patches/patch-src_wmconfig.c
new file mode 100644
index 0000000000..f1b0295299
--- /dev/null
+++ b/desktop/wmakerconf/patches/patch-src_wmconfig.c
@@ -0,0 +1,29 @@
+--- src/wmconfig.c.orig 2007-05-18 12:41:22.000000000 +0200
++++ src/wmconfig.c 2020-12-19 11:03:44.037392000 +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-2.12-wmaker-0.95_support.patch b/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch
deleted file mode 100644
index 5b598c3c15..0000000000
--- a/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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 a971aba9b7..54ee03c70c 100644
--- a/desktop/wmakerconf/wmakerconf.SlackBuild
+++ b/desktop/wmakerconf/wmakerconf.SlackBuild
@@ -7,12 +7,12 @@
PRGNAM=wmakerconf
VERSION=${VERSION:-2.12}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -23,8 +23,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -53,14 +53,13 @@ find -L . \
\( -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
+# Use freebsd patches, as the *BSD seem the only one who still keep maintaining this...
+for i in $CWD/patches/* ; do patch -p0 < $i ; done
-# Fix linking to X11 libs
-sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in
+# Fix linking
+sed -e "/^LIBS =/s/$/ -lX11 -lWUtil/" -i src/Makefile.in
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-deprecated-declarations" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \