aboutsummaryrefslogtreecommitdiffstats
path: root/testing/fltk
diff options
context:
space:
mode:
authorIsaac Dunham <ibid.ag@gmail.com>2014-11-18 21:41:36 -0800
committerNatanael Copa <ncopa@alpinelinux.org>2014-11-19 08:17:19 +0000
commit6a7ca203ef1b561069e17a3463e085d1eb7c8837 (patch)
treedce05ffb273e536e574fe32236757c6415152a64 /testing/fltk
parent45a696e796150bfb88a2cda8a4fa3803ab23c27c (diff)
downloadaports-6a7ca203ef1b561069e17a3463e085d1eb7c8837.tar.bz2
aports-6a7ca203ef1b561069e17a3463e085d1eb7c8837.tar.xz
testing/fltk: update to 1.3.3
Diffstat (limited to 'testing/fltk')
-rw-r--r--testing/fltk/APKBUILD19
-rw-r--r--testing/fltk/ewmh-crash.patch23
2 files changed, 35 insertions, 7 deletions
diff --git a/testing/fltk/APKBUILD b/testing/fltk/APKBUILD
index 0c48f45e79..3295312b30 100644
--- a/testing/fltk/APKBUILD
+++ b/testing/fltk/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: ScrumpyJack <scrumpyjack@me.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fltk
-pkgver=1.3.2
-pkgrel=1
+pkgver=1.3.3
+pkgrel=0
pkgdesc="A cross-platform C++ GUI toolkit"
url="http://fltk.org"
arch="all"
@@ -12,7 +12,8 @@ depends_dev="libx11-dev libxext-dev libxft-dev"
makedepends="$depends_dev libpng-dev libjpeg-turbo-dev"
install=""
subpackages="$pkgname-doc $pkgname-dev $pkgname-fluid"
-source="http://fltk.org/pub/fltk/$pkgver/$pkgname-$pkgver-source.tar.gz"
+source="http://fltk.org/pub/fltk/$pkgver/$pkgname-$pkgver-source.tar.gz
+ ewmh-crash.patch"
_builddir=$srcdir/${pkgname}-${pkgver}
prepare() {
@@ -35,7 +36,8 @@ build() {
--enable-threads \
--with-optim="$CXXFLAGS" \
|| return 1
- make V=1
+ make V=1 || return 1
+
}
@@ -53,6 +55,9 @@ fluid() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-md5sums="9f7e707d4fb7a5a76f0f9b73ff70623d fltk-1.3.2-source.tar.gz"
-sha256sums="176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 fltk-1.3.2-source.tar.gz"
-sha512sums="9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e fltk-1.3.2-source.tar.gz"
+md5sums="9ccdb0d19dc104b87179bd9fd10822e3 fltk-1.3.3-source.tar.gz
+0b1a9c825de9de368550d10728878019 ewmh-crash.patch"
+sha256sums="f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 fltk-1.3.3-source.tar.gz
+15adf29c8d2885bc356943f05b3f22b2db42a5278a9a27d8b1bd3f342f3f4416 ewmh-crash.patch"
+sha512sums="277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d fltk-1.3.3-source.tar.gz
+7e7c43620c91f83da190227d829ebe652ccf1e02ad40e6b3d2631959716304612f447f2dffba0f19fc2c5191692e23581c438945f61669f4974845a1ac1e9929 ewmh-crash.patch"
diff --git a/testing/fltk/ewmh-crash.patch b/testing/fltk/ewmh-crash.patch
new file mode 100644
index 0000000000..6b7d08e1bb
--- /dev/null
+++ b/testing/fltk/ewmh-crash.patch
@@ -0,0 +1,23 @@
+commit 6bea02745202d86a10da82d34f1f6a9233267297
+Author: lauri <cand.svn@fltk.example.org>
+Date: Tue Nov 4 17:26:47 2014 +0000
+
+ The EWMH check requires an open display.
+
+ Fixes a crash when a program calls take_focus() before any window has been show()n.
+
+
+ git-svn-id: http://seriss.com/public/fltk/fltk/branches/branch-1.3@10434 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
+
+diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
+index 8e7100b..a0767a3 100644
+--- a/src/Fl_x.cxx
++++ b/src/Fl_x.cxx
+@@ -2211,6 +2211,7 @@ int Fl_X::ewmh_supported() {
+ static int result = -1;
+
+ if (result == -1) {
++ fl_open_display();
+ result = 0;
+ unsigned long nitems;
+ unsigned long *words = 0;