aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-09-02 04:35:56 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-09-02 04:53:40 -0300
commit9317adb66040c171484d0dd28cbd3c7142d7e8ab (patch)
tree512a8caa79d810ef17fbd8fa36a9d7ac17d45f4e
parent46a1e45e551cb27f002165a388547f16591db5c8 (diff)
downloadaports-9317adb66040c171484d0dd28cbd3c7142d7e8ab.tar.bz2
aports-9317adb66040c171484d0dd28cbd3c7142d7e8ab.tar.xz
testing/netsurf: upgrade to 3.9
-rw-r--r--testing/netsurf/APKBUILD51
-rw-r--r--testing/netsurf/netsurf4
2 files changed, 38 insertions, 17 deletions
diff --git a/testing/netsurf/APKBUILD b/testing/netsurf/APKBUILD
index 121cfef072..c4ccf42693 100644
--- a/testing/netsurf/APKBUILD
+++ b/testing/netsurf/APKBUILD
@@ -2,42 +2,63 @@
# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
pkgname=netsurf
-pkgver=3.8
+pkgver=3.9
pkgrel=0
pkgdesc="NetSurf is a free, open source web browser."
url="http://www.netsurf-browser.org"
arch="all"
license="GPL-2.0"
-depends=""
-depends_dev=""
makedepends="curl-dev openssl-dev doxygen flex bison libwebp-dev lcms2-dev
- libmng-dev gperf libglade-dev gtk+-dev libcurl libpng-dev libidn-dev
- check-dev libharu-dev librsvg-dev libjpeg-turbo-dev"
-install=""
+ libmng-dev gperf libglade-dev gtk+3.0-dev libcurl libpng-dev libidn-dev
+ check-dev libharu-dev librsvg-dev libjpeg-turbo-dev vim"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::http://download.netsurf-browser.org/netsurf/releases/source-full/$pkgname-all-$pkgver.tar.gz
+source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz
netsurf"
builddir="$srcdir"/$pkgname-all-$pkgver
+
prepare() {
default_prepare
sed 's:-Werror::' -i "$builddir"/libsvgtiny/Makefile
}
build() {
- cd "$builddir"
- make PREFIX=/usr TARGET=gtk
+ make \
+ TARGET=gtk \
+ NETSURF_GTK_MAJOR=3 \
+ LIBDIR=lib \
+ INCLUDEDIR=include \
+ PREFIX=/usr
}
package() {
- cd "$builddir"
- make PREFIX=/usr TARGET=gtk DESTDIR="$pkgdir" install
+ make \
+ TARGET=gtk \
+ NETSURF_GTK_MAJOR=3 \
+ LIBDIR=lib \
+ INCLUDEDIR=include \
+ DESTDIR="$pkgdir" \
+ PREFIX=/usr \
+ install
install -Dm755 "$srcdir/netsurf" "$pkgdir/usr/bin/$pkgname"
- mkdir -p "$pkgdir"/usr/share/man/man1/
- install -Dm644 netsurf/docs/netsurf-gtk.1 "$pkgdir"/usr/share/man/man1/
+ install -Dm644 netsurf/docs/netsurf-gtk.1 -t "$pkgdir"/usr/share/man/man1
+
+ # Icon
+ install -Dm644 netsurf/frontends/gtk/res/netsurf.xpm \
+ "$pkgdir"/usr/share/pixmaps/netsurf.xpm
+
+ # Desktop file
+ install -Dm644 netsurf/frontends/gtk/res/netsurf-gtk.desktop \
+ "$pkgdir"/usr/share/applications/netsurf.desktop
+
+ # Run netsurf, not netsurf-gtk
+ sed \
+ -e 's:netsurf-gtk:netsurf:g' \
+ -e 's:netsurf.png:netsurf:g' \
+ -i "$pkgdir"/usr/share/applications/netsurf.desktop
}
-sha512sums="cc040566b2ae4bda1fa15f75f246b2977f17b1f0adc747ddf86a9f8873bc25dce46cacce8e3d80146e72cc0227b1642c9da8b39a73ca2b5bb254334a25b8136a netsurf-3.8.tar.gz
-a22f945720d3bd8fc27396aea973be1e0b6f7a03bbe438fb48faf680882be46b05fc252b5fe8d55cde0cc11f3647f4ac331dcc330f47ae12a93b327f30a9ad2a netsurf"
+sha512sums="3223b0a3bc9721ea1a5a81bbabdda11e1d0f63850074a5dea3ea8999e53c92f07228f58befbf10359c028965131426888a8b9595d6c3cd7a5cde33ca256cf987 netsurf-all-3.9.tar.gz
+4f6868f377abb1fbade92088bee9a319952c4cee82821ca5b3f892484e0d111f33045c8583f3d069e48af6f3f2fcad43c364daa0f5457b3b013542793ac10fcf netsurf"
diff --git a/testing/netsurf/netsurf b/testing/netsurf/netsurf
index 41f440945f..30b6c5216e 100644
--- a/testing/netsurf/netsurf
+++ b/testing/netsurf/netsurf
@@ -1,7 +1,7 @@
#!/bin/sh
shortname=$(echo $LANG | cut -b1-2)
if [ -d /usr/share/netsurf/$shortname ]; then
- /usr/bin/netsurf-gtk "$@"
+ /usr/bin/netsurf-gtk3 "$@"
else
- LANG=en /usr/bin/netsurf-gtk "$@"
+ LANG=en /usr/bin/netsurf-gtk3 "$@"
fi