From 4aa900f06bac618c1ade5fa05e5c6f8f5d29e614 Mon Sep 17 00:00:00 2001 From: onekk Date: Thu, 3 Apr 2014 10:48:54 +0200 Subject: [PATCH 1/3] New packages: leafpad sakura wmctrl xscreensaver --- srcpkgs/leafpad/template | 15 +++++++++++++++ srcpkgs/sakura/template | 15 +++++++++++++++ srcpkgs/wmctrl/template | 15 +++++++++++++++ srcpkgs/xscreensaver/template | 15 +++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 srcpkgs/leafpad/template create mode 100644 srcpkgs/sakura/template create mode 100644 srcpkgs/wmctrl/template create mode 100644 srcpkgs/xscreensaver/template diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template new file mode 100644 index 00000000000..01f3997acd5 --- /dev/null +++ b/srcpkgs/leafpad/template @@ -0,0 +1,15 @@ +# Template file for 'foo' + +pkgname="leafpad" +version="0.8.18.1" +revision=1 +build_style=gnu-configure +short_desc="GTK+ Simple text editor" +maintainer="Carlo Dormeletti " +license="GPL-2" +makedepends="gettext-devel intltool pkg-config gtk+-devel" +depends="gettext gtk+>=2.10" +homepage="http://tarot.freeshell.org/leafpad/" +distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz" +checksum="959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c" + diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template new file mode 100644 index 00000000000..bdb4a2ece9d --- /dev/null +++ b/srcpkgs/sakura/template @@ -0,0 +1,15 @@ +# Template file for 'foo' + +pkgname="sakura" +version="3.1.3" +revision=1 +build_style=cmake +short_desc="Simple but powerful libvte based terminal emulator" +maintainer="Carlo Dormeletti " +license="GPL-2" +makedepends="cmake pkg-config vte3-devel glib-devel gtk+3-devel" +#depends="gettext gtk+>=2.10" +homepage="https://launchpad.net/sakura" +distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2" +checksum="951ee3ca8c569556ca78e338ad38b9a85c5017aeb17a1d1ce032c33d61e28ad3" + diff --git a/srcpkgs/wmctrl/template b/srcpkgs/wmctrl/template new file mode 100644 index 00000000000..3ff658dc4d2 --- /dev/null +++ b/srcpkgs/wmctrl/template @@ -0,0 +1,15 @@ +# Template file for 'foo' + +pkgname="wmctrl" +version="1.07" +revision=1 +build_style=gnu-configure +short_desc="CLI tool to interact with EWMH compliant WM" +maintainer="Carlo Dormeletti " +license="GPL-2" +makedepends="" +#depends="gettext gtk+>=2.10" +homepage="http://tomas.styblo.name/wmctrl/" +distfiles="http://tomas.styblo.name/wmctrl/dist/wmctrl-${version}.tar.gz" +checksum="d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9" + diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template new file mode 100644 index 00000000000..cae390c1627 --- /dev/null +++ b/srcpkgs/xscreensaver/template @@ -0,0 +1,15 @@ +# Template file + +pkgname="xscreensaver" +version="5.26" +revision=1 +build_style=gnu-configure +short_desc="Xscreensaver" +maintainer="Carlo Dormeletti " +license="GPL-2" +makedepends="bc libX11-devel perl pkg-config gtk+-devel gdk-pixbuf-devel +MesaLib-devel libXt-devel libXpm-devel libxml2-devel libglade-devel +glu-devel libjpeg-turbo-devel libXmu-devel" +homepage="http://www.jwz.org/xscreensaver/" +distfiles="http://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz" +checksum="2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55" From 148db5e9e94a0b10a50b9ad72306d603549a04d0 Mon Sep 17 00:00:00 2001 From: onekk Date: Thu, 3 Apr 2014 11:17:48 +0200 Subject: [PATCH 2/3] leafpad: sakura: wmctrl: screensaver: modified --- srcpkgs/leafpad/template | 6 +++--- srcpkgs/sakura/template | 6 +++--- srcpkgs/wmctrl/template | 4 +--- srcpkgs/xscreensaver/template | 7 ++++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template index 01f3997acd5..5f0a7c0e3a3 100644 --- a/srcpkgs/leafpad/template +++ b/srcpkgs/leafpad/template @@ -1,4 +1,4 @@ -# Template file for 'foo' +# Template file for 'leafpad' pkgname="leafpad" version="0.8.18.1" @@ -7,8 +7,8 @@ build_style=gnu-configure short_desc="GTK+ Simple text editor" maintainer="Carlo Dormeletti " license="GPL-2" -makedepends="gettext-devel intltool pkg-config gtk+-devel" -depends="gettext gtk+>=2.10" +hostmakedepends="intltool pkg-config" +makedepends="gettext-devel gtk+-devel" homepage="http://tarot.freeshell.org/leafpad/" distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz" checksum="959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c" diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template index bdb4a2ece9d..e89f309e99e 100644 --- a/srcpkgs/sakura/template +++ b/srcpkgs/sakura/template @@ -1,4 +1,4 @@ -# Template file for 'foo' +# Template file for 'sakura' pkgname="sakura" version="3.1.3" @@ -7,8 +7,8 @@ build_style=cmake short_desc="Simple but powerful libvte based terminal emulator" maintainer="Carlo Dormeletti " license="GPL-2" -makedepends="cmake pkg-config vte3-devel glib-devel gtk+3-devel" -#depends="gettext gtk+>=2.10" +hostmakedepends="cmake pkg-config " +makedepends="vte3-devel glib-devel gtk+3-devel" homepage="https://launchpad.net/sakura" distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2" checksum="951ee3ca8c569556ca78e338ad38b9a85c5017aeb17a1d1ce032c33d61e28ad3" diff --git a/srcpkgs/wmctrl/template b/srcpkgs/wmctrl/template index 3ff658dc4d2..c65bf08b397 100644 --- a/srcpkgs/wmctrl/template +++ b/srcpkgs/wmctrl/template @@ -1,4 +1,4 @@ -# Template file for 'foo' +# Template file for 'wmctrl' pkgname="wmctrl" version="1.07" @@ -7,8 +7,6 @@ build_style=gnu-configure short_desc="CLI tool to interact with EWMH compliant WM" maintainer="Carlo Dormeletti " license="GPL-2" -makedepends="" -#depends="gettext gtk+>=2.10" homepage="http://tomas.styblo.name/wmctrl/" distfiles="http://tomas.styblo.name/wmctrl/dist/wmctrl-${version}.tar.gz" checksum="d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9" diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template index cae390c1627..72c945059e2 100644 --- a/srcpkgs/xscreensaver/template +++ b/srcpkgs/xscreensaver/template @@ -1,13 +1,14 @@ -# Template file +# Template file for 'xscreensaver' pkgname="xscreensaver" version="5.26" revision=1 build_style=gnu-configure -short_desc="Xscreensaver" +short_desc="Screensaver for X complete package" maintainer="Carlo Dormeletti " license="GPL-2" -makedepends="bc libX11-devel perl pkg-config gtk+-devel gdk-pixbuf-devel +hostmakedepends="bc perl pkg-config" +makedepends="libX11-devel gtk+-devel gdk-pixbuf-devel MesaLib-devel libXt-devel libXpm-devel libxml2-devel libglade-devel glu-devel libjpeg-turbo-devel libXmu-devel" homepage="http://www.jwz.org/xscreensaver/" From e707e98d4426eee92b3ffee5b5bb72515be1641e Mon Sep 17 00:00:00 2001 From: onekk Date: Fri, 4 Apr 2014 10:33:09 +0200 Subject: [PATCH 3/3] "wmctrl": added a patch and fixing template file --- srcpkgs/wmctrl/patches/01_64-bit-data.patch | 32 +++++++++++++++++++++ srcpkgs/wmctrl/template | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 srcpkgs/wmctrl/patches/01_64-bit-data.patch diff --git a/srcpkgs/wmctrl/patches/01_64-bit-data.patch b/srcpkgs/wmctrl/patches/01_64-bit-data.patch new file mode 100644 index 00000000000..9d47ea5381f --- /dev/null +++ b/srcpkgs/wmctrl/patches/01_64-bit-data.patch @@ -0,0 +1,32 @@ +Description: Correct 64 Architecture implementation of 32 bit data +Author: Chris Donoghue +Bug-Debian: http://bugs.debian.org/362068 + +--- main.c ++++ main.c +@@ -1425,6 +1425,16 @@ static gchar *get_property (Display *dis + * + * long_length = Specifies the length in 32-bit multiples of the + * data to be retrieved. ++ * ++ * NOTE: see ++ * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html ++ * In particular: ++ * ++ * When the X window system was ported to 64-bit architectures, a ++ * rather peculiar design decision was made. 32-bit quantities such ++ * as Window IDs, atoms, etc, were kept as longs in the client side ++ * APIs, even when long was changed to 64 bits. ++ * + */ + if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False, + xa_prop_type, &xa_ret_type, &ret_format, +@@ -1441,6 +1451,8 @@ static gchar *get_property (Display *dis + + /* null terminate the result to make string handling easier */ + tmp_size = (ret_format / 8) * ret_nitems; ++ /* Correct 64 Architecture implementation of 32 bit data */ ++ if(ret_format==32) tmp_size *= sizeof(long)/4; + ret = g_malloc(tmp_size + 1); + memcpy(ret, ret_prop, tmp_size); + ret[tmp_size] = '\0'; diff --git a/srcpkgs/wmctrl/template b/srcpkgs/wmctrl/template index c65bf08b397..76f526a7e5a 100644 --- a/srcpkgs/wmctrl/template +++ b/srcpkgs/wmctrl/template @@ -7,6 +7,8 @@ build_style=gnu-configure short_desc="CLI tool to interact with EWMH compliant WM" maintainer="Carlo Dormeletti " license="GPL-2" +hostmakedepends="pkg-config" +makedepends="libX11-devel libXmu-devel glib-devel" homepage="http://tomas.styblo.name/wmctrl/" distfiles="http://tomas.styblo.name/wmctrl/dist/wmctrl-${version}.tar.gz" checksum="d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9"