Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7c5929a444108d91414283d2aeac6cdf290624b

commit a7c5929a444108d91414283d2aeac6cdf290624b
Author: gholafox <ghola...@free.fr>
Date:   Mon Jun 28 23:41:43 2010 +0200

xpad-4.0-1-i686

* Fix source and url
* Add patch to fix problem ²with gtk >= 2.20
* Version bump

diff --git a/source/xapps-extra/xpad/FrugalBuild 
b/source/xapps-extra/xpad/FrugalBuild
index ef66f9f..54fc8ee 100644
--- a/source/xapps-extra/xpad/FrugalBuild
+++ b/source/xapps-extra/xpad/FrugalBuild
@@ -1,18 +1,22 @@
-# Compiling Time: 0.05 SBU
+# Compiling Time: 0.07 SBU
# Maintainer: crazy <cr...@frugalware.org>
# Contributor: jedifox <j3d1...@free.fr>

pkgname=xpad
-pkgver=2.14
-pkgrel=3
+pkgver=4.0
+pkgrel=1
pkgdesc="Xpad is a sticky pad, or post-it note, system for X"
-_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
-depends=('libice' 'gtk+2>=2.20.0-2' 'freetype2' \
-       'libxau>=1.0.4' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2')
+url="http://mterry.name/$pkgname";
+depends=('libice' 'gtk+2>=2.20.0-2' 'freetype2'        'libxau>=1.0.4' \
+       'libxdmcp' 'libxdamage' 'libxext' 'libxml2')
+makedepends=('intltool')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
-sha1sums=('c4c71216d6834a69df3fae9de14ac3fee19ea27c')
+source=(http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2
 \
+       xpad-gtk-2.20.patch)
+up2date="lynx -dump $url |grep 'Version'|sed 's/.* \([0-9\.]*\)/\1/'"
+sha1sums=('9d9c7c5ed6feb8aac97fc48bfcd662c3b0dbcba5' \
+          '376d4d40a372f30e2c02c6fc0984f22c4114b5d3')

# optimization OK
diff --git a/source/xapps-extra/xpad/xpad-gtk-2.20.patch 
b/source/xapps-extra/xpad/xpad-gtk-2.20.patch
new file mode 100644
index 0000000..9c14db0
--- /dev/null
+++ b/source/xapps-extra/xpad/xpad-gtk-2.20.patch
@@ -0,0 +1,104 @@
+#######
+# Patch retrieved via Arch Linux repo :)
+# Author: Sergej Pupykin
+# Goal: Fix the problem of unusable window with the last version of GTK
+########
+
+Only in xpad-4.0.my/autopackage: default.apspec
+Only in xpad-4.0.my/autopackage: Makefile
+Only in xpad-4.0.my: config.h
+Only in xpad-4.0.my: config.log
+Only in xpad-4.0.my: config.status
+Only in xpad-4.0.my/doc: Makefile
+Only in xpad-4.0.my/images: Makefile
+Only in xpad-4.0.my: Makefile
+Only in xpad-4.0.my/po: af.gmo
+Only in xpad-4.0.my/po: bg.gmo
+Only in xpad-4.0.my/po: cs.gmo
+Only in xpad-4.0.my/po: da.gmo
+Only in xpad-4.0.my/po: de.gmo
+Only in xpad-4.0.my/po: en_GB.gmo
+Only in xpad-4.0.my/po: es.gmo
+Only in xpad-4.0.my/po: et.gmo
+Only in xpad-4.0.my/po: fi.gmo
+Only in xpad-4.0.my/po: fr.gmo
+Only in xpad-4.0.my/po: ga.gmo
+Only in xpad-4.0.my/po: hr.gmo
+Only in xpad-4.0.my/po: hu.gmo
+Only in xpad-4.0.my/po: .intltool-merge-cache
+Only in xpad-4.0.my/po: it.gmo
+Only in xpad-4.0.my/po: ja.gmo
+Only in xpad-4.0.my/po: ko.gmo
+Only in xpad-4.0.my/po: lv.gmo
+Only in xpad-4.0.my/po: Makefile
+Only in xpad-4.0.my/po: Makefile.in
+Only in xpad-4.0.my/po: nl.gmo
+Only in xpad-4.0.my/po: POTFILES
+Only in xpad-4.0.my/po: pt.gmo
+Only in xpad-4.0.my/po: ro.gmo
+Only in xpad-4.0.my/po: ru.gmo
+Only in xpad-4.0.my/po: rw.gmo
+Only in xpad-4.0.my/po: stamp-it
+Only in xpad-4.0.my/po: sv.gmo
+Only in xpad-4.0.my/po: th.gmo
+Only in xpad-4.0.my/po: tr.gmo
+Only in xpad-4.0.my/po: vi.gmo
+Only in xpad-4.0.my/po: zh_CN.gmo
+Only in xpad-4.0.my/po: zh_TW.gmo
+Only in xpad-4.0.my/src: .deps
+Only in xpad-4.0.my/src: fio.o
+Only in xpad-4.0.my/src: help.o
+Only in xpad-4.0.my/src: Makefile
+Only in xpad-4.0.my/src: prefix.o
+Only in xpad-4.0.my/src: xpad
+Only in xpad-4.0.my/src: xpad-app.o
+Only in xpad-4.0.my/src: xpad-grip-tool-item.o
+diff -wbBur xpad-4.0/src/xpad-pad.c xpad-4.0.my/src/xpad-pad.c
+--- xpad-4.0/src/xpad-pad.c    2009-05-11 01:44:09.000000000 +0000
++++ xpad-4.0.my/src/xpad-pad.c 2010-04-12 15:25:24.000000000 +0000
+@@ -268,18 +268,22 @@
+               NULL));
+       gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, 
"expand", FALSE, NULL);
+
+-      g_object_set (G_OBJECT (pad),
+-              "decorated", xpad_settings_get_has_decorations (xpad_settings 
()),
+-              "default-height", xpad_settings_get_height (xpad_settings ()),
+-              "default-width", xpad_settings_get_width (xpad_settings ()),
+-              "gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving 
pad x,y work */
+-              "skip-pager-hint", !xpad_settings_get_has_decorations 
(xpad_settings ()),
+-              "skip-taskbar-hint", !xpad_settings_get_has_decorations 
(xpad_settings ()),
+-              "type", GTK_WINDOW_TOPLEVEL,
+-              "type-hint", GDK_WINDOW_TYPE_HINT_NORMAL,
+-              "window-position", GTK_WIN_POS_MOUSE,
+-              "child", vbox,
+-              NULL);
++//    g_object_set (G_OBJECT (pad),
++//            "default-height", xpad_settings_get_height (xpad_settings ()),
++//            "default-width", xpad_settings_get_width (xpad_settings ()),
++//            "gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving 
pad x,y work */
++//            "skip-pager-hint", !xpad_settings_get_has_decorations 
(xpad_settings ()),
++//            "skip-taskbar-hint", !xpad_settings_get_has_decorations 
(xpad_settings ()),
++//            "type", GTK_WINDOW_TOPLEVEL,
++//            "window-position", GTK_WIN_POS_MOUSE,
++//            "child", vbox,
++//            NULL);
++
++      gtk_window_set_type_hint (GTK_WINDOW (pad), 
GDK_WINDOW_TYPE_HINT_NORMAL);
++      gtk_window_set_decorated (GTK_WINDOW (pad), 
xpad_settings_get_has_decorations (xpad_settings ()));
++      gtk_window_set_resizable (GTK_WINDOW (pad), TRUE);
++      gtk_container_add (GTK_CONTAINER (pad), vbox);
++
+
+       xpad_pad_notify_has_scrollbar (pad);
+
+Only in xpad-4.0.my/src: xpad-pad-group.o
+Only in xpad-4.0.my/src: xpad-pad.o
+Only in xpad-4.0.my/src: xpad-pad-properties.o
+Only in xpad-4.0.my/src: xpad-preferences.o
+Only in xpad-4.0.my/src: xpad-session-manager.o
+Only in xpad-4.0.my/src: xpad-settings.o
+Only in xpad-4.0.my/src: xpad-text-buffer.o
+Only in xpad-4.0.my/src: xpad-text-view.o
+Only in xpad-4.0.my/src: xpad-toolbar.o
+Only in xpad-4.0.my/src: xpad-tray.o
+Only in xpad-4.0.my: stamp-h1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to