diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-08 14:18:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-08 14:18:19 +0000 |
| commit | d37644a45a76e58b588f79c79336d95fe033cde4 (patch) | |
| tree | 443c2f899eceedf2924020bf6c191100bd6572cc | |
| parent | 53c626f191b03ad955ca9f975fc47b07d5bfe73f (diff) | |
| download | aports-d37644a45a76e58b588f79c79336d95fe033cde4.tar.bz2 aports-d37644a45a76e58b588f79c79336d95fe033cde4.tar.xz | |
testing/dillo: upgrade to 3.0.5
| -rw-r--r-- | testing/dillo/APKBUILD | 15 | ||||
| -rw-r--r-- | testing/dillo/fl_oldfocus.patch | 32 |
2 files changed, 6 insertions, 41 deletions
diff --git a/testing/dillo/APKBUILD b/testing/dillo/APKBUILD index 6939c7d6d9..68ac4ac347 100644 --- a/testing/dillo/APKBUILD +++ b/testing/dillo/APKBUILD @@ -1,8 +1,8 @@ # Contributor: ScrumpyJack <scrumpyjack@me.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dillo -pkgver=3.0.4 -pkgrel=1 +pkgver=3.0.5 +pkgrel=0 pkgdesc="Very small and fast GUI web browser" url="http://www.dillo.org" arch="all" @@ -13,7 +13,6 @@ makedepends="fltk-dev zlib-dev libx11-dev libpng-dev libjpeg-turbo-dev install="" subpackages="$pkgname-doc" source="http://www.dillo.org/download/${pkgname}-${pkgver}.tar.bz2 - fl_oldfocus.patch dillo.desktop dillo.png " @@ -22,6 +21,7 @@ _builddir=$srcdir/${pkgname}-${pkgver} prepare() { local i cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; @@ -52,15 +52,12 @@ package() { || return 1 } -md5sums="c85aab6b840527e1dd71b220a1dcfbab dillo-3.0.4.tar.bz2 -a33a0de688bd8a90f03600246bdf4e97 fl_oldfocus.patch +md5sums="554aad93b6107bba696f4da022c41561 dillo-3.0.5.tar.bz2 ffb9cdcb3506b5aeba9e0d1bcaa4006d dillo.desktop 2ca5fb738b70051cac592acef3cb56e1 dillo.png" -sha256sums="ee2bab25010dd27b18ba80259df6eb8f6b549f5af596539c08eed0b70322df39 dillo-3.0.4.tar.bz2 -7ccb60b485373fb47b5f48e4319de50016b51b03b0f43704ffbb6779da0d1774 fl_oldfocus.patch +sha256sums="db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b dillo-3.0.5.tar.bz2 54848080de1911a2af8ff786fbe92bdad8fe8b7b8a0d580c9c79b0a98f9fdcde dillo.desktop de629745e6f3a271475a501e2b94558b3deb7bf9a407bcef16426e600e1731f3 dillo.png" -sha512sums="57513342026288255f3a2a783f206a24b9b29a03f4721d34f6e43111d61b248c56e1212abdb51adcc826c4ca081f9fa5157247c00eda95d9b5287556fe9da175 dillo-3.0.4.tar.bz2 -7bb6ceac74b0207e8895a3fcf69b348f29c425abe7577a6f481f5a18a512923bcb164b2bf68b7fdab6722e364643874318d8636ac101fcc2b50a4bc511ca52f7 fl_oldfocus.patch +sha512sums="d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155 dillo-3.0.5.tar.bz2 393a749d33f78e4c8a99c0c94a9708b26d235356f0c8dfa942af4e8da7eb9aa2453911894461714986449dfd15a4b492ef9071fac6b230f52a8f2e562f1bf016 dillo.desktop cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833 dillo.png" diff --git a/testing/dillo/fl_oldfocus.patch b/testing/dillo/fl_oldfocus.patch deleted file mode 100644 index 58859cb535..0000000000 --- a/testing/dillo/fl_oldfocus.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 6cace8b8ecedd11a54b02e1dd08f9a2880bdb1b1 -Author: Isaac Dunham <ibid.ag@gmail.com> -Date: Tue Nov 18 21:06:54 2014 -0800 - - Don't use FLTK internal symbols; fix build with FLTK 1.3.3 - Patch based on http://hg.dillo.org/dillo/raw-rev/eb902ac9fc66 - -diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc -index 30a19d5..9ec5a71 100644 ---- a/dw/fltkviewbase.cc -+++ b/dw/fltkviewbase.cc -@@ -27,8 +27,6 @@ - #include <stdio.h> - #include "../lout/msg.h" - --extern Fl_Widget* fl_oldfocus; -- - using namespace lout::object; - using namespace lout::container::typed; - -@@ -364,7 +362,10 @@ int FltkViewBase::handle (int event) - } - return 1; - case FL_UNFOCUS: -- focused_child = fl_oldfocus; -+ // was: focused_child = fl_oldfocus; -+ for (Fl_Widget *p = this; p; p = p->parent()) -+ focused_child = p; -+ - return 0; - case FL_KEYBOARD: - if (Fl::event_key() == FL_Tab) |