Date: Monday, October 22, 2018 @ 12:59:27 Author: arodseth Revision: 398395
upgpkg: midori 0.5.11-10 Modified: midori/trunk/PKGBUILD ----------+ PKGBUILD | 45 +++++++++++---------------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-22 12:46:49 UTC (rev 398394) +++ PKGBUILD 2018-10-22 12:59:27 UTC (rev 398395) @@ -1,57 +1,34 @@ # Maintainer: Alexander F. Rødseth <[email protected]> # Contributor: Andreas Radke <[email protected]> -# Contributor: rabyte <rabyte.at.gmail.dot.com> -# Contributor: Johannes Krampf <wuischke.at.amule.dot.org> +# Contributor: rabyte <[email protected]> +# Contributor: Johannes Krampf <[email protected]> # Contributor: Bartłomiej Piotrowski <[email protected]> pkgname=midori pkgver=0.5.11 -pkgrel=9 +pkgrel=10 pkgdesc='Lightweight web browser' arch=('x86_64') url='https://midori-browser.org/' license=('LGPL') -provides=('midori') -replaces=('midori-gtk3') -depends=('aria2' 'gcr' 'libxss' 'webkit2gtk' 'zeitgeist') -makedepends=('bzr' 'cmake' 'intltool' 'ninja' 'vala') +depends=('aria2' 'gcr' 'gobject-introspection-runtime' 'libpeas' 'libxss' 'webkit2gtk' 'zeitgeist') +makedepends=('bzr' 'cmake' 'git' 'gobject-introspection' 'intltool' 'ninja' 'vala') optdepends=('gst-plugins-base: HTML5 OGG videos support' 'gst-plugins-good: HTML5 H264 and WebM videos support' 'gst-libav: HTML5 H264 videos support') options=('!emptydirs') -source=("https://midori-browser.org/wp-content/uploads/2018/08/${pkgname}_${pkgver}_all_.tar.bz2";) -sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d') +# The latest release of Midori does not build with GTK+ > 3.10. +# Using latest git commit while waiting for the next release. +source=("$pkgname::git+https://github.com/midori-browser/core.git#commit=7dab517e66475929336e80840cce2351891dd4ef";) +md5sums=('SKIP') # NOTE: Set GTK_CSD=1 for enabling client side decorations when running Midori -prepare() { - cd "$pkgname-$pkgver" - - msg2 'Fixing issues in the Vala sources...' - sed 's/protected Tally/public Tally/g' -i midori/midori-notebook.vala - sed 's/%d other files/%u other files/g' -i extensions/transfers.vala - for f in transfers adblock/widgets apps history-list notes; do - sed 's,.remove (iter,.remove (ref iter,g' -i "extensions/$f.vala" - done - - msg2 'Fixing constants that were deprecated in Gtk 3.10...' - # https://lazka.github.io/pgi-docs/Gtk-3.0/constants.html - find . -type f -regex '.*\.\(c\|vala\)' -exec sed -i \ - 's/Gtk.STOCK_FILE/"text-x-generic"/g;s/Gtk.STOCK_CLOSE/"window-close"/g;s/Gtk.STOCK_ADD/"list-add"/g;s/Gtk.STOCK_HELP/"help-browser"/g;s/Gtk.STOCK_APPLY/""/g;s/Gtk.STOCK_CANCEL/""/g;s/Gtk.STOCK_COPY/"edit-copy"/g;s/Gtk.STOCK_DELETE/"edit-delete"/g;s/Gtk.STOCK_EDIT/""/g;s/Gtk.STOCK_OPEN/"document-open"/g;s/Gtk.STOCK_PREFERENCES/"preferences-system"/g;s/Gtk.STOCK_PROPERTIES/"document-properties"/g;s/Gtk.STOCK_SAVE/"document-save"/g;s/Gtk.STOCK_CLEAR/"edit-clear"/g;s/Gtk.STOCK_DIRECTORY/"folder"/g' \ - "{}" +; - # https://i-hate-farms.github.io/parrot/gio-2.0/GLib.g_dbus_generate_guid.html - find . -type f -regex '.*\.\(c\|vala\)' -exec sed -i \ - 's/g_dbus_generate_guid/GLib.DBus.generate_guid/g' "{}" +; -} - build() { mkdir -p build cd build - - # CMake + Vala are not swayed by VALAFLAGS to build with PIC. Need to find a different method. - #-DVALAFLAGS="$(for f in $(echo $CFLAGS $CXXFLAGS $LDFLAGS | tr ' ' '\n'); do echo -X "\"$f\""; done | xargs echo)" \ - #-DVALAFLAGS="-X -fPIC" \ - cmake "../$pkgname-$pkgver" \ + # TODO: Check if VALA_CFLAGS is respected + cmake "../$pkgname" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DHALF_BRO_INCOM_WEBKIT2=ON \
