CVS commit: pkgsrc/wm/wmakerconf

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Dec 15 08:02:50 UTC 2019

Modified Files:
        pkgsrc/wm/wmakerconf: Makefile distinfo
        pkgsrc/wm/wmakerconf/patches: patch-src_themebrowser.c
Added Files:
        pkgsrc/wm/wmakerconf/patches: patch-src_misc.c

Log Message:
wmakerconf: fix build with glib2 2.62

Address build failure reported by Arthur Barlow on pkgsrc-users.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/wm/wmakerconf/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/wm/wmakerconf/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/wmakerconf/patches/patch-src_misc.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/wm/wmakerconf/patches/patch-src_themebrowser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/wmakerconf/Makefile
diff -u pkgsrc/wm/wmakerconf/Makefile:1.89 pkgsrc/wm/wmakerconf/Makefile:1.90
--- pkgsrc/wm/wmakerconf/Makefile:1.89  Sun Aug 11 13:24:15 2019
+++ pkgsrc/wm/wmakerconf/Makefile       Sun Dec 15 08:02:50 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2019/08/11 13:24:15 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2019/12/15 08:02:50 gutteridge Exp $
 
 DISTNAME=      wmakerconf-2.11
-PKGREVISION=   51
+PKGREVISION=   52
 CATEGORIES=    x11 wm windowmaker
 MASTER_SITES=  http://starplot.org/wmakerconf/
 

Index: pkgsrc/wm/wmakerconf/distinfo
diff -u pkgsrc/wm/wmakerconf/distinfo:1.10 pkgsrc/wm/wmakerconf/distinfo:1.11
--- pkgsrc/wm/wmakerconf/distinfo:1.10  Mon Nov  2 23:42:55 2015
+++ pkgsrc/wm/wmakerconf/distinfo       Sun Dec 15 08:02:50 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/02 23:42:55 agc Exp $
+$NetBSD: distinfo,v 1.11 2019/12/15 08:02:50 gutteridge Exp $
 
 SHA1 (wmakerconf-2.11.tar.gz) = 2c2409aad8b0348c2801c4350047a5468a800e48
 RMD160 (wmakerconf-2.11.tar.gz) = 18d661836272ae21f9d79398359b37b97b0a396a
@@ -10,7 +10,8 @@ SHA1 (patch-ad) = ebcd4d319c9f0cd995f6b4
 SHA1 (patch-ae) = b656967929071c09bef3315588fede877e839ce6
 SHA1 (patch-af) = c6f05d30ee645d0e7ff1ed574208d5819beeceac
 SHA1 (patch-src_menu.c) = 9ae1df8b5b60881181f75ce409dc29593fe71210
+SHA1 (patch-src_misc.c) = 8e25ce66bcf11e285222df2425dbbe52a5d8adfa
 SHA1 (patch-src_rootmenu.c) = 2e327c2b1b3937e98a5e34f9de65c2d3c726403e
-SHA1 (patch-src_themebrowser.c) = 4b4620d322770aa2806a3c483e94bf4d27381501
+SHA1 (patch-src_themebrowser.c) = 18e17a51d9ee52969d29ab2388d2e0e84cc6373f
 SHA1 (patch-src_window.c) = 4aa5f9f16276c0325b4d0a0b9d39289a89cec4c9
 SHA1 (patch-src_wmconfig.c) = 66d40308389977e9476593586ec8060acef41cae

Index: pkgsrc/wm/wmakerconf/patches/patch-src_themebrowser.c
diff -u pkgsrc/wm/wmakerconf/patches/patch-src_themebrowser.c:1.1 pkgsrc/wm/wmakerconf/patches/patch-src_themebrowser.c:1.2
--- pkgsrc/wm/wmakerconf/patches/patch-src_themebrowser.c:1.1   Wed May 22 18:01:25 2013
+++ pkgsrc/wm/wmakerconf/patches/patch-src_themebrowser.c       Sun Dec 15 08:02:50 2019
@@ -1,10 +1,11 @@
-$NetBSD: patch-src_themebrowser.c,v 1.1 2013/05/22 18:01:25 tron Exp $
+$NetBSD: patch-src_themebrowser.c,v 1.2 2019/12/15 08:02:50 gutteridge Exp $
 
 Fix build with WindowMaker 0.95.4 and change hard coded path name.
+Also avoid deprecated glib2 functions that now cause errors.
 
 --- src/themebrowser.c.orig    2005-02-25 23:37:44.000000000 +0000
-+++ src/themebrowser.c 2013-05-22 18:55:24.000000000 +0100
-@@ -2705,7 +2705,7 @@
++++ src/themebrowser.c
+@@ -2705,7 +2705,7 @@ save_theme_backend (GtkWidget *widget, g
         oldfiles = g_list_remove (oldfiles, tmp);
         Free (tmp);
        }
@@ -13,3 +14,17 @@ Fix build with WindowMaker 0.95.4 and ch
        {
         dialog_popup (DIALOG_ERROR, NULL, NULL,
                       _("Can't save theme file\n`%s'\n"
+@@ -3532,11 +3532,11 @@ compute_preview (GtkWidget *progress_bar
+ 
+    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;

Added files:

Index: pkgsrc/wm/wmakerconf/patches/patch-src_misc.c
diff -u /dev/null pkgsrc/wm/wmakerconf/patches/patch-src_misc.c:1.1
--- /dev/null   Sun Dec 15 08:02:50 2019
+++ pkgsrc/wm/wmakerconf/patches/patch-src_misc.c       Sun Dec 15 08:02:50 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_misc.c,v 1.1 2019/12/15 08:02:50 gutteridge Exp $
+
+Avoid deprecated glib2 functions that now cause errors.
+
+--- src/misc.c.orig    2004-12-05 01:49:32.000000000 +0000
++++ src/misc.c
+@@ -482,9 +482,9 @@ copy_file (const char *dst, const char *
+       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);