Skip to content

Commit

Permalink
Update midori to 7.0.
Browse files Browse the repository at this point in the history
New upstream, lots of changes since the last version we had.

Some more cleanups in the Makefile are still needed, but it builds
and is usable.

Closes #10.
  • Loading branch information
bsiegert committed Dec 6, 2018
1 parent 2b249e6 commit 3538786
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 551 deletions.
29 changes: 17 additions & 12 deletions midori/Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
# $NetBSD: Makefile,v 1.111 2018/11/09 09:17:07 abs Exp $

DISTNAME= midori_0.5.11_all_
PKGNAME= ${DISTNAME:S/_all_//:S/_/-/}
PKGREVISION= 27
DISTNAME= midori-v7.0
PKGNAME= ${DISTNAME:S/v//}
CATEGORIES= www
MASTER_SITES= http://midori-browser.org/downloads/
MASTER_SITES= ${MASTER_SITE_GITHUB:=midori-browser/}
GITHUB_PROJECT= core
GITHUB_RELEASE= v7

MAINTAINER= [email protected]
HOMEPAGE= http://midori-browser.org/
COMMENT= Lightweight web browser using WebKit
LICENSE= gnu-lgpl-v2.1
EXTRACT_SUFX= .tar.bz2
#EXTRACT_SUFX= .tar.bz2

WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
#WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}

USE_CMAKE= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
Expand All @@ -29,25 +30,28 @@ BUILD_DEPENDS+= librsvg>=2.18:../../graphics/librsvg

DEPENDS+= gnome-themes-standard-[0-9]*:../../graphics/gnome-themes-standard

EGDIR= ${PREFIX}/share/examples/midori
OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/midori
CONF_FILES= ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
#EGDIR= ${PREFIX}/share/examples/midori
#OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/midori
#CONF_FILES= ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search

# Otherwise build chokes on .orig files
pre-configure:
${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;

BUILDLINK_TRANSFORM+= rm:-Werror

.include "../../mk/bsd.prefs.mk"

OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
CONF_FILES+= ${EGDIR}/extensions/adblock/config \
${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config
#OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
#CONF_FILES+= ${EGDIR}/extensions/adblock/config \
# ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config

CONFIGURE_ENV= VALAC=${VALAC}

.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
.include "../../devel/libpeas/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../net/libsoup/buildlink3.mk"
Expand All @@ -60,4 +64,5 @@ CONFIGURE_ENV= VALAC=${VALAC}
.include "../../www/webkit-gtk/buildlink3.mk"
BUILDLINK_DEPMETHOD.vala= build
.include "../../lang/vala/buildlink3.mk"
.include "../../wip/gcr/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
80 changes: 18 additions & 62 deletions midori/PLIST
Original file line number Diff line number Diff line change
@@ -1,60 +1,35 @@
@comment $NetBSD$
bin/midori
lib/girepository-1.0/Midori-0.6.typelib
lib/libmidori-core.so
lib/libmidori-core.so.0.0.0
lib/libmidori-core.so.1
lib/midori/libabout.so
lib/libmidori-core.so.0
lib/libmidori-core.so.0.6
lib/midori/adblock.plugin
lib/midori/bookmarks.plugin
lib/midori/colorful-tabs.plugin
lib/midori/libactivatable.so
lib/midori/libadblock.so
lib/midori/libapps.so
lib/midori/libbookmarks.so
lib/midori/libcolorful-tabs.so
lib/midori/libcookie-manager.so
lib/midori/libcopy-tabs.so
lib/midori/libdelayed-load.so
lib/midori/libdevpet.so
lib/midori/libdomain-keys.so
lib/midori/libfeed-panel.so
lib/midori/libflummi.so
lib/midori/libhistory-list.so
lib/midori/libmouse-gestures.so
lib/midori/libnotes.so
lib/midori/libopen-with.so
lib/midori/libshortcuts.so
lib/midori/libsession.so
lib/midori/libstatus-clock.so
lib/midori/libstatusbar-features.so
lib/midori/libtab-panel.so
lib/midori/libtabby.so
lib/midori/libtabs-minimized.so
lib/midori/libtoolbar-editor.so
lib/midori/libtransfers.so
lib/midori/libwebmedia-now-playing.so
lib/midori/session.plugin
lib/midori/status-clock.plugin
lib/midori/statusbar-features.plugin
share/appdata/midori.appdata.xml
share/applications/midori-private.desktop
share/applications/midori.desktop
share/doc/midori/AUTHORS
share/applications/org.midori_browser.Midori.desktop
share/doc/midori/COPYING
share/doc/midori/ChangeLog
share/doc/midori/EXPAT
share/doc/midori/README
share/doc/midori/faq.css
share/doc/midori/faq.html
share/examples/midori/extensions/adblock/config
share/examples/midori/search
share/doc/midori/README.md
share/gir-1.0/Midori-0.6.gir
share/icons/hicolor/16x16/apps/midori.png
share/icons/hicolor/16x16/categories/extension.png
share/icons/hicolor/16x16/status/internet-news-reader.png
share/icons/hicolor/22x22/apps/midori.png
share/icons/hicolor/22x22/categories/extension.png
share/icons/hicolor/22x22/status/internet-news-reader.png
share/icons/hicolor/24x24/status/adblock-blocked.svg
share/icons/hicolor/24x24/status/adblock-disabled.svg
share/icons/hicolor/24x24/status/adblock-enabled.svg
share/icons/hicolor/scalable/apps/midori.svg
share/icons/hicolor/scalable/categories/extension.svg
share/icons/hicolor/scalable/status/internet-news-reader.svg
share/locale/af/LC_MESSAGES/midori.mo
share/locale/am/LC_MESSAGES/midori.mo
share/locale/ar/LC_MESSAGES/midori.mo
share/locale/ast/LC_MESSAGES/midori.mo
share/locale/az/LC_MESSAGES/midori.mo
share/locale/be/LC_MESSAGES/midori.mo
share/locale/bg/LC_MESSAGES/midori.mo
share/locale/bn/LC_MESSAGES/midori.mo
Expand Down Expand Up @@ -114,9 +89,11 @@ share/locale/sq/LC_MESSAGES/midori.mo
share/locale/sr/LC_MESSAGES/midori.mo
share/locale/sr@latin/LC_MESSAGES/midori.mo
share/locale/sv/LC_MESSAGES/midori.mo
share/locale/szl/LC_MESSAGES/midori.mo
share/locale/ta/LC_MESSAGES/midori.mo
share/locale/te/LC_MESSAGES/midori.mo
share/locale/th/LC_MESSAGES/midori.mo
share/locale/tl/LC_MESSAGES/midori.mo
share/locale/tr/LC_MESSAGES/midori.mo
share/locale/ug/LC_MESSAGES/midori.mo
share/locale/uk/LC_MESSAGES/midori.mo
Expand All @@ -126,24 +103,3 @@ share/locale/vi/LC_MESSAGES/midori.mo
share/locale/zh_CN/LC_MESSAGES/midori.mo
share/locale/zh_HK/LC_MESSAGES/midori.mo
share/locale/zh_TW/LC_MESSAGES/midori.mo
share/midori/res/about.css
share/midori/res/adblock.list
share/midori/res/adblock/element_hider.js
share/midori/res/autosuggestcontrol.css
share/midori/res/autosuggestcontrol.js
share/midori/res/bookmarks/Create.sql
share/midori/res/bookmarks/Import_old_db_bookmarks.sql
share/midori/res/error.html
share/midori/res/flummi/Create.sql
share/midori/res/forms/Create.sql
share/midori/res/gtk3.css
share/midori/res/history/Create.sql
share/midori/res/history/Day.sql
share/midori/res/logo-shade.png
share/midori/res/nojs/nojs-statusicon-allowed.png
share/midori/res/nojs/nojs-statusicon-denied.png
share/midori/res/nojs/nojs-statusicon-mixed.png
share/midori/res/notes/Create.sql
share/midori/res/speeddial-head.html
share/midori/res/tabby/Create.sql
share/midori/res/tabby/Update1.sql
19 changes: 4 additions & 15 deletions midori/distinfo
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
$NetBSD: distinfo,v 1.25 2015/10/25 13:50:22 jmcneill Exp $

SHA1 (midori_0.5.11_all_.tar.bz2) = 64c86935028feb5f89d799c2acacaad67764da6f
RMD160 (midori_0.5.11_all_.tar.bz2) = 66aaf624d39fbb86c1bec42972fba7998965ef50
SHA512 (midori_0.5.11_all_.tar.bz2) = 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d
Size (midori_0.5.11_all_.tar.bz2) = 1428791 bytes
SHA1 (patch-CMakeLists.txt) = 68d0232b254e4094118b7f029162bf669f096d45
SHA1 (patch-config_CMakeLists.txt) = 5ac4af9f980749659058fb55e7fd25ad6226861f
SHA1 (patch-extensions_adblock_widgets.vala) = 076a3e9bcc33b20bde4df0ae5f89efd950260087
SHA1 (patch-extensions_apps.vala) = 77b4e5ed86809446b2d63cbf248fd5a9dddd159f
SHA1 (patch-extensions_external-download-manager.vala) = 3ccd1a11828849ddc2e6007f52b3549bdb34418f
SHA1 (patch-extensions_history-list.vala) = e17c5b8ff0bbbaec41b64c813138b564cf555b56
SHA1 (patch-extensions_notes.vala) = 7869734d57377b713b4e78029fc2d12f3d6e7ab5
SHA1 (patch-extensions_open-with.vala) = bb07507b64b73ae7c68aedb7e1f704ba00c323d2
SHA1 (patch-extensions_transfers.vala) = bea6a7789cbda64f8a950360e87b2a256e70d83d
SHA1 (patch-katze_midori-paths.vala) = f304804f39fc47d5c5591c9712a4b98ace3e1b26
SHA1 (patch-midori_midori-notebook.vala) = c117d382af224af05241daaa7ccf991e702098a0
SHA1 (midori-v7.0.tar.gz) = 802ceb76483bf6b9d1dfe94561fb42568e398200
RMD160 (midori-v7.0.tar.gz) = c9b2bb0734db3ddabd5d5f71ab610e4b788804cf
SHA512 (midori-v7.0.tar.gz) = 4110d1566ba8b0979c29f1c3a95af3da4cba884f44a1305403d8951f7f2dfb17946c3c7326eebafc111738950c907d06cc6c54ce670cde321da890d8b9ced051
Size (midori-v7.0.tar.gz) = 1827341 bytes
45 changes: 0 additions & 45 deletions midori/patches/patch-CMakeLists.txt

This file was deleted.

23 changes: 0 additions & 23 deletions midori/patches/patch-config_CMakeLists.txt

This file was deleted.

62 changes: 0 additions & 62 deletions midori/patches/patch-extensions_adblock_widgets.vala

This file was deleted.

51 changes: 0 additions & 51 deletions midori/patches/patch-extensions_apps.vala

This file was deleted.

Loading

0 comments on commit 3538786

Please sign in to comment.