- apply a fix from upstream git to prevent a few gtk-warnings

- regen WANTLIB while here
This commit is contained in:
jasper 2011-10-30 15:32:11 +00:00
parent f0a47ff4e1
commit ad23739c9b
2 changed files with 179 additions and 10 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2011/09/16 12:29:16 espie Exp $
# $OpenBSD: Makefile,v 1.27 2011/10/30 15:32:11 jasper Exp $
COMMENT= configuration utility for openbox
DISTNAME= obconf-2.0.3
REVISION= 9
REVISION= 10
CATEGORIES= x11
HOMEPAGE= http://icculus.org/openbox/index.php/Obconf
@ -16,14 +16,14 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://icculus.org/openbox/obconf/
WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xft Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pangoxft-1.0 pixman-1 png pthread pthread-stubs \
xcb xcb-render xcb-render-util xml2 z gdk-x11-2.0 \
gdk_pixbuf-2.0 gtk-x11-2.0 glade-2.0 startup-notification-1 \
obparser obrender
WANTLIB += GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xft Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glade-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 m obparser obrender pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pangoxft-1.0 pixman-1 png pthread pthread-stubs
WANTLIB += startup-notification-1 xcb xcb-render xcb-shm xml2
WANTLIB += z
MODULES= devel/gettext
LIB_DEPENDS= x11/gtk+2 \

View File

@ -0,0 +1,169 @@
$OpenBSD: patch-src_obconf_glade,v 1.1 2011/10/30 15:32:11 jasper Exp $
don't use a non-zero page size for some spinners (Fix bug #4540)
from upstream git b0465895c15c544111f0dbbcbffab56b476a8749
--- src/obconf.glade.orig Sun Jan 27 21:30:56 2008
+++ src/obconf.glade Sun Oct 30 16:23:01 2011
@@ -1743,7 +1743,7 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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 @@ Omnipresent (On all desktops)</property>
<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>