[arch-commits] Commit in xpad/trunk (PKGBUILD xpad-gtk-2.20.patch)

Mon Jun 23 10:52:33 UTC 2014

Date: Monday, June 23, 2014 @ 12:52:33
  Author: spupykin
Revision: 113442

upgpkg: xpad 4.3-1

upd

Modified:
  xpad/trunk/PKGBUILD
Deleted:
  xpad/trunk/xpad-gtk-2.20.patch

---------------------+
 PKGBUILD            |   12 ++----
 xpad-gtk-2.20.patch |   98 --------------------------------------------------
 2 files changed, 5 insertions(+), 105 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2014-06-23 10:52:23 UTC (rev 113441)
+++ PKGBUILD	2014-06-23 10:52:33 UTC (rev 113442)
@@ -4,19 +4,17 @@
 # Contributor: Ben <contrasutra at myrealbox.com>
 
 pkgname=xpad
-pkgver=4.2
+pkgver=4.3
 pkgrel=1
 pkgdesc="Stickies-like notes program"
 arch=(i686 x86_64)
-depends=('gtk2' 'libsm' 'librsvg')
+depends=('gtk3' 'libsm' 'librsvg')
 makedepends=('intltool')
 url="http://mterry.name/xpad/"
 license=('GPL')
 install=xpad.install
-source=(http://launchpad.net/xpad/trunk/$pkgver/+download/xpad-$pkgver.tar.bz2
-	xpad-gtk-2.20.patch)
-md5sums=('85583f8f68ad61ec282ea1332fe76480'
-         '6a3d2952b469d65ec333714991ba8284')
+source=(http://launchpad.net/xpad/trunk/$pkgver/+download/xpad-$pkgver.tar.bz2)
+md5sums=('d524d693e2ecb6be99a3005b090b2256')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -26,5 +24,5 @@
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install helpdir=$pkgdir/usr/lib/xpad/help
 }

Deleted: xpad-gtk-2.20.patch
===================================================================
--- xpad-gtk-2.20.patch	2014-06-23 10:52:23 UTC (rev 113441)
+++ xpad-gtk-2.20.patch	2014-06-23 10:52:33 UTC (rev 113442)
@@ -1,98 +0,0 @@
-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


