commit bb0b229957aa9e7fd37d5808886885e06eca5f09 Author: Danny Rawlins <monster.romster@gmail.com> Date: Tue Mar 5 14:50:17 2019 +1100 [notify] midori: 0.5.11 -> 8.0 new dependencies: json-glib libpeas diff --git a/midori/.footprint b/midori/.footprint index 1379f4d2..3f8716d2 100644 --- a/midori/.footprint +++ b/midori/.footprint @@ -1,104 +1,43 @@ -drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/xdg/ -drwxr-xr-x root/root etc/xdg/midori/ -drwxr-xr-x root/root etc/xdg/midori/extensions/ -drwxr-xr-x root/root etc/xdg/midori/extensions/adblock/ --rw-r--r-- root/root etc/xdg/midori/extensions/adblock/config --rw-r--r-- root/root etc/xdg/midori/search drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/midori drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libmidori-core.so -> libmidori-core.so.1 --rwxr-xr-x root/root usr/lib/libmidori-core.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libmidori-core.so.1 -> libmidori-core.so.0.0.0 +drwxr-xr-x root/root usr/lib/girepository-1.0/ +-rw-r--r-- root/root usr/lib/girepository-1.0/Midori-0.6.typelib +lrwxrwxrwx root/root usr/lib/libmidori-core.so -> libmidori-core.so.0 +lrwxrwxrwx root/root usr/lib/libmidori-core.so.0 -> libmidori-core.so.0.6 +-rwxr-xr-x root/root usr/lib/libmidori-core.so.0.6 drwxr-xr-x root/root usr/lib/midori/ --rwxr-xr-x root/root usr/lib/midori/libabout.so +-rw-r--r-- root/root usr/lib/midori/adblock.plugin +-rw-r--r-- root/root usr/lib/midori/bookmarks.plugin +-rw-r--r-- root/root usr/lib/midori/colorful-tabs.plugin +-rwxr-xr-x root/root usr/lib/midori/libactivatable.so -rwxr-xr-x root/root usr/lib/midori/libadblock.so --rwxr-xr-x root/root usr/lib/midori/libapps.so +-rwxr-xr-x root/root usr/lib/midori/libbookmarks.so -rwxr-xr-x root/root usr/lib/midori/libcolorful-tabs.so --rwxr-xr-x root/root usr/lib/midori/libcookie-manager.so --rwxr-xr-x root/root usr/lib/midori/libcopy-tabs.so --rwxr-xr-x root/root usr/lib/midori/libdelayed-load.so --rwxr-xr-x root/root usr/lib/midori/libdevpet.so --rwxr-xr-x root/root usr/lib/midori/libdomain-keys.so --rwxr-xr-x root/root usr/lib/midori/libfeed-panel.so --rwxr-xr-x root/root usr/lib/midori/libflummi.so --rwxr-xr-x root/root usr/lib/midori/libhistory-list.so --rwxr-xr-x root/root usr/lib/midori/libmouse-gestures.so --rwxr-xr-x root/root usr/lib/midori/libnotes.so --rwxr-xr-x root/root usr/lib/midori/libopen-with.so --rwxr-xr-x root/root usr/lib/midori/libshortcuts.so +-rwxr-xr-x root/root usr/lib/midori/libsession.so -rwxr-xr-x root/root usr/lib/midori/libstatus-clock.so -rwxr-xr-x root/root usr/lib/midori/libstatusbar-features.so --rwxr-xr-x root/root usr/lib/midori/libtab-panel.so --rwxr-xr-x root/root usr/lib/midori/libtabby.so --rwxr-xr-x root/root usr/lib/midori/libtabs-minimized.so --rwxr-xr-x root/root usr/lib/midori/libtoolbar-editor.so --rwxr-xr-x root/root usr/lib/midori/libtransfers.so --rwxr-xr-x root/root usr/lib/midori/libwebmedia-now-playing.so +-rwxr-xr-x root/root usr/lib/midori/libweb-extensions.so +-rw-r--r-- root/root usr/lib/midori/session.plugin +-rw-r--r-- root/root usr/lib/midori/status-clock.plugin +-rw-r--r-- root/root usr/lib/midori/statusbar-features.plugin +-rw-r--r-- root/root usr/lib/midori/web-extensions.plugin drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/appdata/ --rw-r--r-- root/root usr/share/appdata/midori.appdata.xml drwxr-xr-x root/root usr/share/applications/ --rw-r--r-- root/root usr/share/applications/midori-private.desktop --rw-r--r-- root/root usr/share/applications/midori.desktop +-rw-r--r-- root/root usr/share/applications/org.midori_browser.Midori.desktop +drwxr-xr-x root/root usr/share/gir-1.0/ +-rw-r--r-- root/root usr/share/gir-1.0/Midori-0.6.gir drwxr-xr-x root/root usr/share/icons/ drwxr-xr-x root/root usr/share/icons/hicolor/ drwxr-xr-x root/root usr/share/icons/hicolor/16x16/ drwxr-xr-x root/root usr/share/icons/hicolor/16x16/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/midori.png -drwxr-xr-x root/root usr/share/icons/hicolor/16x16/categories/ --rw-r--r-- root/root usr/share/icons/hicolor/16x16/categories/extension.png -drwxr-xr-x root/root usr/share/icons/hicolor/16x16/status/ --rw-r--r-- root/root usr/share/icons/hicolor/16x16/status/internet-news-reader.png drwxr-xr-x root/root usr/share/icons/hicolor/22x22/ drwxr-xr-x root/root usr/share/icons/hicolor/22x22/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/22x22/apps/midori.png -drwxr-xr-x root/root usr/share/icons/hicolor/22x22/categories/ --rw-r--r-- root/root usr/share/icons/hicolor/22x22/categories/extension.png -drwxr-xr-x root/root usr/share/icons/hicolor/22x22/status/ --rw-r--r-- root/root usr/share/icons/hicolor/22x22/status/internet-news-reader.png -drwxr-xr-x root/root usr/share/icons/hicolor/24x24/ -drwxr-xr-x root/root usr/share/icons/hicolor/24x24/status/ --rw-r--r-- root/root usr/share/icons/hicolor/24x24/status/adblock-blocked.svg --rw-r--r-- root/root usr/share/icons/hicolor/24x24/status/adblock-disabled.svg --rw-r--r-- root/root usr/share/icons/hicolor/24x24/status/adblock-enabled.svg drwxr-xr-x root/root usr/share/icons/hicolor/scalable/ drwxr-xr-x root/root usr/share/icons/hicolor/scalable/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/scalable/apps/midori.svg -drwxr-xr-x root/root usr/share/icons/hicolor/scalable/categories/ --rw-r--r-- root/root usr/share/icons/hicolor/scalable/categories/extension.svg -drwxr-xr-x root/root usr/share/icons/hicolor/scalable/status/ --rw-r--r-- root/root usr/share/icons/hicolor/scalable/status/internet-news-reader.svg -drwxr-xr-x root/root usr/share/midori/ -drwxr-xr-x root/root usr/share/midori/res/ --rw-r--r-- root/root usr/share/midori/res/about.css --rw-r--r-- root/root usr/share/midori/res/adblock.list -drwxr-xr-x root/root usr/share/midori/res/adblock/ --rw-r--r-- root/root usr/share/midori/res/adblock/element_hider.js --rw-r--r-- root/root usr/share/midori/res/autosuggestcontrol.css --rw-r--r-- root/root usr/share/midori/res/autosuggestcontrol.js -drwxr-xr-x root/root usr/share/midori/res/bookmarks/ --rw-r--r-- root/root usr/share/midori/res/bookmarks/Create.sql --rw-r--r-- root/root usr/share/midori/res/bookmarks/Import_old_db_bookmarks.sql --rw-r--r-- root/root usr/share/midori/res/error.html -drwxr-xr-x root/root usr/share/midori/res/flummi/ --rw-r--r-- root/root usr/share/midori/res/flummi/Create.sql -drwxr-xr-x root/root usr/share/midori/res/forms/ --rw-r--r-- root/root usr/share/midori/res/forms/Create.sql --rw-r--r-- root/root usr/share/midori/res/gtk3.css -drwxr-xr-x root/root usr/share/midori/res/history/ --rw-r--r-- root/root usr/share/midori/res/history/Create.sql --rw-r--r-- root/root usr/share/midori/res/history/Day.sql --rw-r--r-- root/root usr/share/midori/res/logo-shade.png -drwxr-xr-x root/root usr/share/midori/res/nojs/ --rw-r--r-- root/root usr/share/midori/res/nojs/nojs-statusicon-allowed.png --rw-r--r-- root/root usr/share/midori/res/nojs/nojs-statusicon-denied.png --rw-r--r-- root/root usr/share/midori/res/nojs/nojs-statusicon-mixed.png -drwxr-xr-x root/root usr/share/midori/res/notes/ --rw-r--r-- root/root usr/share/midori/res/notes/Create.sql --rw-r--r-- root/root usr/share/midori/res/speeddial-head.html -drwxr-xr-x root/root usr/share/midori/res/tabby/ --rw-r--r-- root/root usr/share/midori/res/tabby/Create.sql --rw-r--r-- root/root usr/share/midori/res/tabby/Update1.sql +drwxr-xr-x root/root usr/share/metainfo/ +-rw-r--r-- root/root usr/share/metainfo/midori.appdata.xml diff --git a/midori/.signature b/midori/.signature index f6ae0e02..c22cc7ff 100644 --- a/midori/.signature +++ b/midori/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/f0WYFD1bgorppNlQYAeljhKaI3jOcO2WLIItfYGXW1sqAflwuRWXBV6T71VE53f7UI7u65qaILMsqmwJKldwg= -SHA256 (Pkgfile) = 17b0a2f074473e7cf6559aa753e4e532ca2abb835beb435f8498d2aa31f6b734 -SHA256 (.footprint) = f4df9398cdfaede75189efab5b8e05f96457c15be40c089b6fe13fd54c5a4ce0 -SHA256 (midori_0.5.11_all_.tar.bz2) = 96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d +RWSagIOpLGJF32deMoQaC9dOt7VygZ8BmSBe61NXRwhy2TkOgeN+WIBmaEiYrUJn0twGDmUpr8pFDjhdxVgTSZDvSvarzIPBZwk= +SHA256 (Pkgfile) = 00cf2791a785db5e64dd292b21dde2f788e7b534961eccbbf6c10570d107a2fc +SHA256 (.footprint) = 2953b122068bb2f11df66f54eaa669e0e8ebbc88da1bf79b0cd28dd782846c52 +SHA256 (midori-v8.0.tar.gz) = 559ec7cc8903a423958f660f6ffb29f30e9e357b85c19ecd296e8911dc92be3c diff --git a/midori/Pkgfile b/midori/Pkgfile index 1a5395fa..f7b19447 100644 --- a/midori/Pkgfile +++ b/midori/Pkgfile @@ -1,23 +1,15 @@ # Description: Midori is a lightweight web browser. # URL: http://www.midori-browser.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Brett Goulder, predatorfreak at dcaf-security dot org -# Depends on: aria2 desktop-file-utils gcr gst-libav gst-plugins-good libnotify webkitgtk xorg-libxscrnsaver +# Depends on: aria2 desktop-file-utils gcr gst-libav gst-plugins-good json-glib libnotify libpeas webkitgtk xorg-libxscrnsaver name=midori -version=0.5.11 -release=2 -source=(http://midori-browser.org/downloads/${name}_${version}_all_.tar.bz2) +version=8.0 +release=1 +source=(https://github.com/midori-browser/core/releases/download/v$version/$name-v$v...) build() { - cd $name-$version - - # The latest release of vala is a bit stricter than the previous one - 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 + cd $name-v$version install -d build cd build @@ -27,7 +19,8 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DHALF_BRO_INCOM_WEBKIT2=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS="$CFLAGS -w" \ + -DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \ + -DVALA_CFLAGS="$CFLAGS -fPIC -w" \ -DUSE_ZEITGEIST=OFF \ -G Ninja