diff options
author | Petr Vaněk <arkamar@atlas.cz> | 2023-03-27 20:52:47 +0200 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2023-04-05 15:30:23 +0300 |
commit | bb08ba37f6caa05dd4367f11528fca848a607f90 (patch) | |
tree | 8023cdb06649be419b69f656e51f4aa283a9883f /www-client/surf | |
parent | dev-python/pylint: Stabilize 2.17.1 ALLARCHES, #903813 (diff) | |
download | gentoo-bb08ba37f6caa05dd4367f11528fca848a607f90.tar.gz gentoo-bb08ba37f6caa05dd4367f11528fca848a607f90.tar.bz2 gentoo-bb08ba37f6caa05dd4367f11528fca848a607f90.zip |
www-client/surf: drop 2.1-r2
Remove version depending on net-libs/webkit-gtk:4.
Bug: https://bugs.gentoo.org/893716
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/30373
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'www-client/surf')
-rw-r--r-- | www-client/surf/files/surf-2.1-gentoo.patch | 28 | ||||
-rw-r--r-- | www-client/surf/surf-2.1-r2.ebuild | 98 |
2 files changed, 0 insertions, 126 deletions
diff --git a/www-client/surf/files/surf-2.1-gentoo.patch b/www-client/surf/files/surf-2.1-gentoo.patch deleted file mode 100644 index 9ef89da23668..000000000000 --- a/www-client/surf/files/surf-2.1-gentoo.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -4,18 +4,18 @@ VERSION = 2.1 - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = /usr - MANPREFIX = $(PREFIX)/share/man - LIBPREFIX = $(PREFIX)/lib - LIBDIR = $(LIBPREFIX)/surf - --X11INC = `pkg-config --cflags x11` --X11LIB = `pkg-config --libs x11` -+X11INC = $(shell $(PKG_CONFIG) --cflags x11) -+X11LIB = $(shell $(PKG_CONFIG) --libs x11) - --GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` --GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` --WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` --WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0) -+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.0) -+WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0) -+WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0) - - # includes and libs - INCS = $(X11INC) $(GTKINC) diff --git a/www-client/surf/surf-2.1-r2.ebuild b/www-client/surf/surf-2.1-r2.ebuild deleted file mode 100644 index 796e5b7dcbb9..000000000000 --- a/www-client/surf/surf-2.1-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop savedconfig toolchain-funcs xdg - -DESCRIPTION="A simple web browser based on WebKit/GTK+" -HOMEPAGE="https://surf.suckless.org/" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.suckless.org/surf" - EGIT_BRANCH="surf-webkit2" -else - SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~riscv x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="tabbed" - -DEPEND=" - app-crypt/gcr:0=[gtk] - dev-libs/glib:2 - net-libs/webkit-gtk:4 - x11-libs/gtk+:3 - x11-libs/libX11 -" -RDEPEND="${DEPEND} - !sci-chemistry/surf - !savedconfig? ( - net-misc/curl - x11-apps/xprop - x11-misc/dmenu - x11-terms/st - ) - tabbed? ( x11-misc/tabbed ) -" -BDEPEND=" - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -pkg_setup() { - if ! use savedconfig; then - elog "The default config.h assumes you have" - elog " net-misc/curl" - elog " x11-terms/st" - elog "installed to support the download function." - elog "Without those, downloads will fail (gracefully)." - elog "You can fix this by:" - elog "1) Installing these packages, or" - elog "2) Setting USE=savedconfig and changing config.h accordingly." - fi -} - -src_prepare() { - default - - restore_config config.h - - tc-export CC PKG_CONFIG -} - -src_install() { - default - - if use tabbed; then - dobin surf-open.sh - fi - - save_config config.h - - newicon "${S}/${PN}.png" "${PN}.png" - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" - make_desktop_entry \ - "surf %u" \ - "Surf" \ - "surf" \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=surf" -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} |