obconf needs some love...

Fix "Gtk-WARNING **: GtkSpinButton: setting an adjustment with non-zero page 
size is deprecated"

Fix "tar: unknown option -- -" when installing new themes (unsupported gnuism 
in tar cmdline)
        Added ::archivers/gtar in RUN_DEPENDS

Fix lib-depends-check

Both inline diff and tar.gz included.

Best Regards
-david-


diff -Naur obconf.orig/Makefile obconf/Makefile
--- obconf.orig/Makefile        Fri Jan 16 09:06:26 2009
+++ obconf/Makefile     Fri Jan 23 16:08:11 2009
@@ -3,7 +3,7 @@
 COMMENT=       configuration utility for openbox
 
 DISTNAME=      obconf-2.0.3
-PKGNAME=       ${DISTNAME}p0
+PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    x11
 
 HOMEPAGE=      http://icculus.org/openbox/index.php/Obconf
@@ -18,16 +18,17 @@
 
 WANTLIB=       ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi \
                Xinerama Xrandr Xrender atk-1.0 c cairo expat \
-               fontconfig freetype glib-2.0 glitz gmodule-2.0 \
+               fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
                gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-               pangoxft-1.0 png xml2 z Xcomposite Xdamage
+               pangoxft-1.0 pixman-1 png xml2 z Xcomposite Xdamage
 
 MODULES=       devel/gettext
 LIB_DEPENDS=   gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
                glade-2.0.>=0.1::devel/libglade2 \
                startup-notification-1::devel/startup-notification \
                obparser.>=7,obrender.>=7::x11/openbox
-RUN_DEPENDS=   :desktop-file-utils-*:devel/desktop-file-utils \
+RUN_DEPENDS=   ::archivers/gtar \
+               :desktop-file-utils-*:devel/desktop-file-utils \
                :shared-mime-info->=0.21:misc/shared-mime-info
 
 USE_X11=       Yes
diff -Naur obconf.orig/patches/patch-src_archive_c 
obconf/patches/patch-src_archive_c
--- obconf.orig/patches/patch-src_archive_c     Thu Jan  1 01:00:00 1970
+++ obconf/patches/patch-src_archive_c  Fri Jan 23 15:58:48 2009
@@ -0,0 +1,38 @@
+--- src/archive.c.orig 2009-01-23 15:52:58.000000000 +0100
++++ src/archive.c      2009-01-23 15:53:49.000000000 +0100
+@@ -84,7 +84,7 @@
+     parentdir = g_build_path(G_DIR_SEPARATOR_S, dir, "..", NULL);
+ 
+     argv = g_new(gchar*, 9);
+-    argv[0] = g_strdup("tar");
++    argv[0] = g_strdup("gtar");
+     argv[1] = g_strdup("-c");
+     argv[2] = g_strdup("-z");
+     argv[3] = g_strdup("-f");
+@@ -103,7 +103,7 @@
+ 
+     }
+     else
+-        gtk_msg(GTK_MESSAGE_ERROR, _("Unable to run the \"tar\" command: %s"),
++        gtk_msg(GTK_MESSAGE_ERROR, _("Unable to run the \"gtar\" command: 
%s"),
+                 e->message);
+ 
+     g_strfreev(argv);
+@@ -174,7 +174,7 @@
+     glob = g_strdup_printf("*/openbox-3/", name);
+ 
+     argv = g_new(gchar*, 11);
+-    argv[0] = g_strdup("tar");
++    argv[0] = g_strdup("gtar");
+     argv[1] = g_strdup("-x");
+     argv[2] = g_strdup("-v");
+     argv[3] = g_strdup("-z");
+@@ -187,7 +187,7 @@
+     argv[10] = NULL;
+     if (!g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
+                       &outtxt, &errtxt, &exitcode, &e))
+-        gtk_msg(GTK_MESSAGE_ERROR, _("Unable to run the \"tar\" command: %s"),
++        gtk_msg(GTK_MESSAGE_ERROR, _("Unable to run the \"gtar\" command: 
%s"),
+                 e->message);
+     g_strfreev(argv);
+     if (e) g_error_free(e);
diff -Naur obconf.orig/patches/patch-src_obconf_glade 
obconf/patches/patch-src_obconf_glade
--- obconf.orig/patches/patch-src_obconf_glade  Thu Jan  1 01:00:00 1970
+++ obconf/patches/patch-src_obconf_glade       Fri Jan 23 15:58:48 2009
@@ -0,0 +1,164 @@
+--- src/obconf.glade.orig      2009-01-23 15:33:55.000000000 +0100
++++ src/obconf.glade   2009-01-23 15:35:11.000000000 +0100
+@@ -1743,7 +1743,7 @@
+                                 <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                 <property 
name="snap_to_ticks">False</property>
+                                 <property name="wrap">False</property>
+-                                <property name="adjustment">1 1 100 1 10 
10</property>
++                                <property name="adjustment">1 1 100 1 10 
0</property>
+                                 <signal name="value_changed" 
handler="on_drag_threshold_value_changed" after="yes" 
last_modification_time="Thu, 31 May 2007 16:02:00 GMT"/>
+                               </widget>
+                               <packing>
+@@ -1827,7 +1827,7 @@
+                                 <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                 <property 
name="snap_to_ticks">False</property>
+                                 <property name="wrap">False</property>
+-                                <property name="adjustment">20 0 100 1 10 
10</property>
++                                <property name="adjustment">20 0 100 1 10 
0</property>
+                                 <signal name="value_changed" 
handler="on_resist_window_value_changed" after="yes" 
last_modification_time="Tue, 23 Sep 2003 22:22:53 GMT"/>
+                               </widget>
+                               <packing>
+@@ -1911,7 +1911,7 @@
+                                 <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                 <property 
name="snap_to_ticks">False</property>
+                                 <property name="wrap">False</property>
+-                                <property name="adjustment">1 0 100 1 10 
10</property>
++                                <property name="adjustment">1 0 100 1 10 
0</property>
+                                 <signal name="value_changed" 
handler="on_resist_edge_value_changed" after="yes" last_modification_time="Tue, 
23 Sep 2003 22:23:04 GMT"/>
+                               </widget>
+                               <packing>
+@@ -2046,7 +2046,7 @@
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+-                                    <property name="adjustment">0 100 10000 
10 10 10</property>
++                                    <property name="adjustment">0 100 10000 
10 10 0</property>
+                                     <signal name="value_changed" 
handler="on_warp_edge_time_value_changed" after="yes" 
last_modification_time="Sat, 04 Aug 2007 15:51:02 GMT"/>
+                                   </widget>
+                                   <packing>
+@@ -2488,7 +2488,7 @@
+                                                 <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                                 <property 
name="snap_to_ticks">False</property>
+                                                 <property 
name="wrap">False</property>
+-                                                <property name="adjustment">1 
0 1000 1 10 10</property>
++                                                <property name="adjustment">1 
0 1000 1 10 0</property>
+                                                 <signal name="value_changed" 
handler="on_fixed_x_pos_value_changed" after="yes" last_modification_time="Sat, 
12 Jan 2008 18:21:45 GMT"/>
+                                               </widget>
+                                               <packing>
+@@ -2630,7 +2630,7 @@
+                                                 <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                                 <property 
name="snap_to_ticks">False</property>
+                                                 <property 
name="wrap">False</property>
+-                                                <property name="adjustment">1 
0 1000 1 10 10</property>
++                                                <property name="adjustment">1 
0 1000 1 10 0</property>
+                                                 <signal name="value_changed" 
handler="on_fixed_y_pos_value_changed" after="yes" last_modification_time="Sat, 
12 Jan 2008 18:22:16 GMT"/>
+                                               </widget>
+                                               <packing>
+@@ -2984,7 +2984,7 @@
+                                         <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                         <property 
name="snap_to_ticks">False</property>
+                                         <property name="wrap">False</property>
+-                                        <property name="adjustment">0 0 10000 
10 10 10</property>
++                                        <property name="adjustment">0 0 10000 
10 10 0</property>
+                                         <signal name="value_changed" 
handler="on_focus_delay_value_changed" after="yes" last_modification_time="Sun, 
14 Sep 2003 11:24:28 GMT"/>
+                                       </widget>
+                                       <packing>
+@@ -3246,7 +3246,7 @@
+                                 <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                 <property 
name="snap_to_ticks">False</property>
+                                 <property name="wrap">False</property>
+-                                <property name="adjustment">0 0 10000 10 10 
10</property>
++                                <property name="adjustment">0 0 10000 10 10 
0</property>
+                                 <signal name="value_changed" 
handler="on_doubleclick_time_value_changed" after="yes" 
last_modification_time="Thu, 31 May 2007 16:09:40 GMT"/>
+                               </widget>
+                               <packing>
+@@ -3552,7 +3552,7 @@
+                                 <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                 <property 
name="snap_to_ticks">False</property>
+                                 <property name="wrap">False</property>
+-                                <property name="adjustment">0 1 10000 10 10 
10</property>
++                                <property name="adjustment">0 1 10000 10 10 
0</property>
+                                 <signal name="value_changed" 
handler="on_desktop_popup_time_value_changed" after="yes" 
last_modification_time="Sat, 04 Aug 2007 16:03:27 GMT"/>
+                               </widget>
+                               <packing>
+@@ -3643,7 +3643,7 @@
+                             <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                             <property name="snap_to_ticks">False</property>
+                             <property name="wrap">False</property>
+-                            <property name="adjustment">1 1 100 1 10 
10</property>
++                            <property name="adjustment">1 1 100 1 10 
0</property>
+                             <signal name="value_changed" 
handler="on_desktop_num_value_changed" after="yes" last_modification_time="Mon, 
15 Sep 2003 01:16:20 GMT"/>
+                           </widget>
+                           <packing>
+@@ -3988,7 +3988,7 @@
+                                         <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                         <property 
name="snap_to_ticks">False</property>
+                                         <property name="wrap">False</property>
+-                                        <property name="adjustment">20 0 100 
1 10 10</property>
++                                        <property name="adjustment">20 0 100 
1 10 0</property>
+                                         <signal name="value_changed" 
handler="on_margins_top_value_changed" after="yes" last_modification_time="Thu, 
19 Jul 2007 23:50:09 GMT"/>
+                                       </widget>
+                                       <packing>
+@@ -4230,7 +4230,7 @@
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+-                                    <property name="adjustment">20 0 100 1 10 
10</property>
++                                    <property name="adjustment">20 0 100 1 10 
0</property>
+                                     <signal name="value_changed" 
handler="on_margins_left_value_changed" after="yes" 
last_modification_time="Thu, 19 Jul 2007 23:50:31 GMT"/>
+                                   </widget>
+                                   <packing>
+@@ -4443,7 +4443,7 @@
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+-                                    <property name="adjustment">20 0 100 1 10 
10</property>
++                                    <property name="adjustment">20 0 100 1 10 
0</property>
+                                     <signal name="value_changed" 
handler="on_margins_right_value_changed" after="yes" 
last_modification_time="Thu, 19 Jul 2007 23:50:41 GMT"/>
+                                   </widget>
+                                   <packing>
+@@ -4678,7 +4678,7 @@
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+-                                    <property name="adjustment">20 0 100 1 10 
10</property>
++                                    <property name="adjustment">20 0 100 1 10 
0</property>
+                                     <signal name="value_changed" 
handler="on_margins_bottom_value_changed" after="yes" 
last_modification_time="Thu, 19 Jul 2007 23:50:59 GMT"/>
+                                   </widget>
+                                   <packing>
+@@ -5163,7 +5163,7 @@
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+-                                    <property name="adjustment">1 0 10000 1 
10 10</property>
++                                    <property name="adjustment">1 0 10000 1 
10 0</property>
+                                     <signal name="value_changed" 
handler="on_dock_float_x_value_changed" after="yes" 
last_modification_time="Sun, 14 Sep 2003 11:07:38 GMT"/>
+                                   </widget>
+                                   <packing>
+@@ -5208,7 +5208,7 @@
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+-                                    <property name="adjustment">1 0 10000 1 
10 10</property>
++                                    <property name="adjustment">1 0 10000 1 
10 0</property>
+                                     <signal name="value_changed" 
handler="on_dock_float_y_value_changed" after="yes" 
last_modification_time="Sun, 14 Sep 2003 11:08:09 GMT"/>
+                                   </widget>
+                                   <packing>
+@@ -5698,7 +5698,7 @@
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+-                                    <property name="adjustment">300 0 10000 
10 10 10</property>
++                                    <property name="adjustment">300 0 10000 
10 10 0</property>
+                                     <signal name="value_changed" 
handler="on_dock_hide_delay_value_changed" after="yes" 
last_modification_time="Sun, 14 Sep 2003 11:08:49 GMT"/>
+                                   </widget>
+                                   <packing>
+@@ -5820,7 +5820,7 @@
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+-                                    <property name="adjustment">300 0 10000 
10 10 10</property>
++                                    <property name="adjustment">300 0 10000 
10 10 0</property>
+                                     <signal name="value_changed" 
handler="on_dock_show_delay_value_changed" after="yes" 
last_modification_time="Thu, 31 May 2007 15:17:16 GMT"/>
+                                   </widget>
+                                   <packing>

Attachment: obconf-port.tar.gz
Description: Binary data

Reply via email to