2 2

[alpine-devel] [PATCH] main/midori: update to 0.5.9

AmatCoder
Details
Message ID
<1416326119-4400-1-git-send-email-amatcoder@gmail.com>
Sender timestamp
1416326119
DKIM signature
missing
Download raw message
Patch: +11 -42
Changes:
- I cleaned the APKBUILD
- I deleted the install files (they are not needed anymore AFAIK)
- Now midori uses gtk2

I am not the maintainer so changes are only suggestions. Feel free
to avoid them.
---
 main/midori/APKBUILD              | 43 ++++++++++-----------------------------
 main/midori/midori.post-deinstall |  5 -----
 main/midori/midori.post-install   |  4 ----
 main/midori/midori.post-upgrade   |  1 -
 4 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 main/midori/midori.post-deinstall
 delete mode 100644 main/midori/midori.post-install
 delete mode 120000 main/midori/midori.post-upgrade

diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD
index c2ce148..514ef2f 100644
--- a/main/midori/APKBUILD
+++ b/main/midori/APKBUILD
@@ -1,41 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=midori
-pkgver=0.5.8
-pkgrel=1
+pkgver=0.5.9
+pkgrel=0
 pkgdesc="A lightweight web browser based on Gtk WebKit"
-url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+url="http://www.midori-browser.org"
 arch="all"
 license="LGPL2+"
-depends="
-	desktop-file-utils
-	hicolor-icon-theme
-	"
-makedepends="
-	cmake
-	gettext-dev
-	git
-	intltool
-	libidn-dev
-	libnotify-dev
-	librsvg-dev
-	libsoup-dev
-	libunique3-dev
-	libxml2-dev
-	libxscrnsaver-dev
-	paxctl
-	pkgconfig
-	python
-	sqlite-dev
-	vala
-	webkitgtk-dev
-	"
+depends=""
+depends_dev="libnotify-dev libunique-dev webkitgtk-dev"
+makedepends=" $depends_dev cmake librsvg-dev paxctl python vala"
 subpackages="$pkgname-lang"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+install=""
 source="http://www.midori-browser.org/downloads/midori_${pkgver}_all_.tar.bz2
 	execinfo-detect.patch
 	"
 
-_builddir="$srcdir"
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
 	for i in $source; do
@@ -51,7 +31,6 @@ build() {
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DUSE_GTK3=ON \
 		-DUSE_ZEITGEIST=OFF \
 		. || return 1
 	make
@@ -64,9 +43,9 @@ package() {
 	paxctl -c -m -p "$pkgdir"/usr/bin/midori
 }
 
-md5sums="b89e25e74199d705e74767499a415976  midori_0.5.8_all_.tar.bz2
+md5sums="a0af659e0f1d6edb2c97aefdc8c0f097  midori_0.5.9_all_.tar.bz2
 38acb831d862fa8d9aaa9097b4180840  execinfo-detect.patch"
-sha256sums="af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381  midori_0.5.8_all_.tar.bz2
+sha256sums="b1a5309d926ea4e394f4a39552023b0427cf23053793d325e3daefceed282ec0  midori_0.5.9_all_.tar.bz2
 cc8c5f1402aa7785d67df96f05c72dcbe74c67624834f427e09ceb44ab6d73c7  execinfo-detect.patch"
-sha512sums="3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5  midori_0.5.8_all_.tar.bz2
+sha512sums="5f1f42347f85485fd07a12d5dd1c42ab341895be1d5e897ef829bf81357ceae988f6679ef8432688f01168d7ae97ead541d0d732a14b7ac36e033bf3b271b7c2  midori_0.5.9_all_.tar.bz2
 20cd27a801bf1dcf1c9e4e4642a4a342f5a70e0f97843b155588c80f1e4976dd6f8fd95d5e2d6c416de3f7181d0719e3e04d2d09b6a8d105df4510ef0090bc45  execinfo-detect.patch"
diff --git a/main/midori/midori.post-deinstall b/main/midori/midori.post-deinstall
deleted file mode 100644
index 00ebf0b..0000000
--- a/main/midori/midori.post-deinstall
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-update-desktop-database -q
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-
diff --git a/main/midori/midori.post-install b/main/midori/midori.post-install
deleted file mode 100644
index 9f24aec..0000000
--- a/main/midori/midori.post-install
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-update-desktop-database -q
diff --git a/main/midori/midori.post-upgrade b/main/midori/midori.post-upgrade
deleted file mode 120000
index 41bc70a..0000000
--- a/main/midori/midori.post-upgrade
@@ -1 +0,0 @@
-midori.post-install
\ No newline at end of file
-- 
2.1.3



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20141119082958.486d333f@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1416326119-4400-1-git-send-email-amatcoder@gmail.com> (view parent)
Sender timestamp
1416382198
DKIM signature
missing
Download raw message
On Tue, 18 Nov 2014 15:55:19 +0000
AmatCoder <amatcoder@gmail.com> wrote:

> Changes:
> - I cleaned the APKBUILD
> - I deleted the install files (they are not needed anymore AFAIK)
> - Now midori uses gtk2
>
> 
> I am not the maintainer so changes are only suggestions. Feel free
> to avoid them.

The changes are good. The only question I have is about gtk2. Isn't
gtk3 the way forward?

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Amat Coder
Details
Message ID
<CAHLLVvHopi5zpSjaQjpY0+oxSmoF_o6U=M=Nt09dd8tDRA9iEQ@mail.gmail.com>
In-Reply-To
<20141119082958.486d333f@ncopa-desktop.alpinelinux.org> (view parent)
Sender timestamp
1416390469
DKIM signature
missing
Download raw message
2014-11-19 7:29 GMT+00:00 Natanael Copa <ncopa@alpinelinux.org>:

> On Tue, 18 Nov 2014 15:55:19 +0000
> AmatCoder <amatcoder@gmail.com> wrote:
>
> > Changes:
> > - I cleaned the APKBUILD
> > - I deleted the install files (they are not needed anymore AFAIK)
> > - Now midori uses gtk2
> >
> >
> > I am not the maintainer so changes are only suggestions. Feel free
> > to avoid them.
>
> The changes are good. The only question I have is about gtk2. Isn't
> gtk3 the way forward?
>
> -nc
>

Yes, but while xfce4 is stuck with gtk2, I think that it's better for
consistency (all others components are gtk2) and to avoid gtk3
dependency just for midori.

Anyway, midori 0.6.x versions are planned to use gtk3 only (and webkit3)
so it will be unavoidable, but until then...