diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-11-14 20:33:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-11-15 17:31:35 +0000 |
| commit | b181ab842deba1a8909b84dcae7d2f8cf0a94610 (patch) | |
| tree | 9dfff72a43a4f16cd307db5baf4ca7afeff3b738 /main/fltk | |
| parent | 3673e451f5d391978cf0bfdfd4b8a1ddd5362d8e (diff) | |
| download | aports-b181ab842deba1a8909b84dcae7d2f8cf0a94610.tar.bz2 aports-b181ab842deba1a8909b84dcae7d2f8cf0a94610.tar.xz | |
main/fltk: upgrade to 1.3.4
Diffstat (limited to 'main/fltk')
| -rw-r--r-- | main/fltk/APKBUILD | 19 | ||||
| -rw-r--r-- | main/fltk/Fl_XFont_On_Demand.patch | 36 | ||||
| -rw-r--r-- | main/fltk/ewmh-crash.patch | 23 |
3 files changed, 6 insertions, 72 deletions
diff --git a/main/fltk/APKBUILD b/main/fltk/APKBUILD index 66fffc107c..2895c1d646 100644 --- a/main/fltk/APKBUILD +++ b/main/fltk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to> # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to> pkgname=fltk -pkgver=1.3.3 -pkgrel=1 +pkgver=1.3.4 +pkgrel=0 pkgdesc="A cross-platform C++ GUI toolkit" url="http://fltk.org" arch="all" @@ -12,8 +12,7 @@ depends_dev="libx11-dev libxext-dev libxft-dev mesa-dev" makedepends="$depends_dev libpng-dev libjpeg-turbo-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-fluid" source="http://fltk.org/pub/fltk/$pkgver/$pkgname-$pkgver-source.tar.gz - Fl_XFont_On_Demand.patch - ewmh-crash.patch" + " builddir="$srcdir/$pkgname-$pkgver" build() { @@ -45,12 +44,6 @@ fluid() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="9ccdb0d19dc104b87179bd9fd10822e3 fltk-1.3.3-source.tar.gz -e33e95ed8aacf84048f7b175112f7837 Fl_XFont_On_Demand.patch -0b1a9c825de9de368550d10728878019 ewmh-crash.patch" -sha256sums="f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 fltk-1.3.3-source.tar.gz -afdd3dcbdf0b64bd813c28fb116663762dd81c19f535d8850a7c644b9005c788 Fl_XFont_On_Demand.patch -15adf29c8d2885bc356943f05b3f22b2db42a5278a9a27d8b1bd3f342f3f4416 ewmh-crash.patch" -sha512sums="277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d fltk-1.3.3-source.tar.gz -0f094a3ac5e10f5736ffebb92abf12637b371b3b469f1aac4670114b788c9cd3c8cacf68ebe5d5d29db4d99094f14fdc19777aeacc784c90073659561055b574 Fl_XFont_On_Demand.patch -7e7c43620c91f83da190227d829ebe652ccf1e02ad40e6b3d2631959716304612f447f2dffba0f19fc2c5191692e23581c438945f61669f4974845a1ac1e9929 ewmh-crash.patch" +md5sums="c0e43ac259ac8c5d0f7634566e21e3f8 fltk-1.3.4-source.tar.gz" +sha256sums="c8ab01c4e860d53e11d40dc28f98d2fe9c85aaf6dbb5af50fd6e66afec3dc58f fltk-1.3.4-source.tar.gz" +sha512sums="92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2 fltk-1.3.4-source.tar.gz" diff --git a/main/fltk/Fl_XFont_On_Demand.patch b/main/fltk/Fl_XFont_On_Demand.patch deleted file mode 100644 index 4b51089383..0000000000 --- a/main/fltk/Fl_XFont_On_Demand.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- fltk-1.3.3/src/fl_font.cxx -+++ fltk-1.3.3/src/fl_font.cxx -@@ -55,6 +55,12 @@ - # include "fl_font_x.cxx" - #endif // WIN32 - -+#if ! (defined(WIN32) || defined(__APPLE__)) -+XFontStruct *fl_X_core_font() -+{ -+ return fl_xfont.value(); -+} -+#endif - - double fl_width(const char* c) { - if (c) return fl_width(c, (int) strlen(c)); ---- fltk-1.3.3/src/gl_draw.cxx -+++ fltk-1.3.3/src/gl_draw.cxx -@@ -81,7 +81,7 @@ - * then sorting through them at draw time (for normal X rendering) to find which one can - * render the current glyph... But for now, just use the first font in the list for GL... - */ -- XFontStruct *font = fl_xfont; -+ XFontStruct *font = fl_X_core_font(); - int base = font->min_char_or_byte2; - int count = font->max_char_or_byte2-base+1; - fl_fontsize->listbase = glGenLists(256); ---- fltk-1.3.3/FL/x.H -+++ fltk-1.3.3/FL/x.H -@@ -132,6 +132,7 @@ - XFontStruct *ptr; - }; - extern FL_EXPORT Fl_XFont_On_Demand fl_xfont; -+extern FL_EXPORT XFontStruct* fl_X_core_font(); - - // this object contains all X-specific stuff about a window: - // Warning: this object is highly subject to change! diff --git a/main/fltk/ewmh-crash.patch b/main/fltk/ewmh-crash.patch deleted file mode 100644 index 6b7d08e1bb..0000000000 --- a/main/fltk/ewmh-crash.patch +++ /dev/null @@ -1,23 +0,0 @@ -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; |