* [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/, www-client/surf/
@ 2015-12-28 7:38 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2015-12-28 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 83e529a3c3b7f7c6ad88338e0211a9c680718c4a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 07:36:18 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 07:38:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e529a3
www-client/surf: Version bump.
Package-Manager: portage-2.2.26
www-client/surf/Manifest | 1 +
www-client/surf/files/surf-0.7-gentoo.patch | 84 +++++++++++++++++++++++++++++
www-client/surf/surf-0.7.ebuild | 71 ++++++++++++++++++++++++
3 files changed, 156 insertions(+)
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index cea1d6f..18ff0ad 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1 +1,2 @@
DIST surf-0.6.tar.gz 14781 SHA256 fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 SHA512 f3550535351e37296280d33d229998e1f00aa605d0dab4a58944cf213721e823a1cfd9134b7bca2a4d61e265122a30d5dc917a290163ed8af2b24cd75d41a100 WHIRLPOOL 2a163d450b47b4964ce3686d76bf6e3a747984f0e86f84e2dccfa9d3e885bc26adf0100cdef48ae19d91f34a2d14d6c4950d2a7db7d333612e2b1fc48b077f99
+DIST surf-0.7.tar.gz 18792 SHA256 95608546fb64d01c7a8153c356be0e284ebe120c3c596a94eb3f3ad47e1c494a SHA512 a6a0e172d99f8ce5a7eb63bd34ef3e55ae26059cc94148cf7c50ac665a5e64d90f4a6b1e71b73c1fa763dfaef9b50aaae79e924724f564b2ddf2b8aef4268ff6 WHIRLPOOL 6dbda75a102e108fb0d2910018b0b622189d3729326ba7ce69c4995c599f0d041bc5add771bdd27444752b6e627fcff6c546259e8605189f465e825578a9949b
diff --git a/www-client/surf/files/surf-0.7-gentoo.patch b/www-client/surf/files/surf-0.7-gentoo.patch
new file mode 100644
index 0000000..0be4598
--- /dev/null
+++ b/www-client/surf/files/surf-0.7-gentoo.patch
@@ -0,0 +1,84 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,27 +4,27 @@
+ # Customize below to fit your system
+
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = ${PREFIX}/share/man
+
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = $(shell $(PKG_CONFIG) --cflags x11)
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+
+-GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
+-GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0)
+
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
++INCS = -I. -I/usr/include ${X11INC} ${GTKINC}
++LIBS = ${X11LIB} ${GTKLIB}
+
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -g ${LIBS}
++CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS = ${LIBS}
+
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
+
+ # compiler and linker
+-CC = cc
++CC ?= cc
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,16 @@
+ @echo "CC = ${CC}"
+
+ .c.o:
+- @echo CC $<
+- @${CC} -c ${CFLAGS} $<
++ ${CC} -c ${CFLAGS} $<
+
+ ${OBJ}: config.h config.mk
+
+ config.h:
+ @echo creating $@ from config.def.h
+- @cp config.def.h $@
++ cp config.def.h $@
+
+ surf: ${OBJ}
+- @echo CC -o $@
+- @${CC} -o $@ surf.o ${LDFLAGS}
++ ${CC} -o $@ surf.o ${LDFLAGS}
+
+ clean:
+ @echo cleaning
+@@ -44,13 +42,13 @@
+
+ install: all
+ @echo installing executable file to ${DESTDIR}${PREFIX}/bin
+- @mkdir -p ${DESTDIR}${PREFIX}/bin
+- @cp -f surf ${DESTDIR}${PREFIX}/bin
+- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf
++ mkdir -p ${DESTDIR}${PREFIX}/bin
++ cp -f surf ${DESTDIR}${PREFIX}/bin
++ chmod 755 ${DESTDIR}${PREFIX}/bin/surf
+ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
+- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
+- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
++ mkdir -p ${DESTDIR}${MANPREFIX}/man1
++ sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
++ chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
+
+ uninstall:
+ @echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/www-client/surf/surf-0.7.ebuild b/www-client/surf/surf-0.7.ebuild
new file mode 100644
index 0000000..834dd70
--- /dev/null
+++ b/www-client/surf/surf-0.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="a simple web browser based on WebKit/GTK+"
+HOMEPAGE="http://surf.suckless.org/"
+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ dev-libs/glib
+ net-libs/libsoup
+ net-libs/webkit-gtk:2
+ x11-libs/gtk+:2
+ x11-libs/libX11
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="
+ !sci-chemistry/surf
+ ${COMMON_DEPEND}
+ x11-apps/xprop
+ x11-misc/dmenu
+ !savedconfig? (
+ net-misc/curl
+ x11-terms/st
+ )
+"
+
+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() {
+ epatch "${FILESDIR}"/${PN}-0.7-gentoo.patch
+
+ epatch_user
+
+ restore_config config.h
+
+ tc-export CC PKG_CONFIG
+}
+
+src_install() {
+ default
+ save_config config.h
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then
+ ewarn "Please correct the permissions of your \$HOME/.surf/ directory"
+ ewarn "and its contents to no longer be world readable (see bug #404983)"
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/, www-client/surf/
@ 2017-03-29 4:19 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2017-03-29 4:19 UTC (permalink / raw
To: gentoo-commits
commit: 67d4ee3054b05ae19d952a8652e245b148a032bb
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 04:18:17 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 04:18:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d4ee30
www-client/surf: Update live ebuild.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
www-client/surf/files/surf-9999-gentoo.patch | 133 ---------------------------
www-client/surf/surf-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 134 deletions(-)
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
deleted file mode 100644
index 424b08d75cc..00000000000
--- a/www-client/surf/files/surf-9999-gentoo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -4,27 +4,27 @@
- # Customize below to fit your system
-
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+PREFIX = /usr
-+MANPREFIX = $(PREFIX)/share/man
-
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = $(shell $(PKG_CONFIG) --cflags x11)
-+X11LIB = $(shell $(PKG_CONFIG) --libs x11)
-
--GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
--GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0)
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0)
-
- # includes and libs
--INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
-+INCS = -I. -I/usr/include $(X11INC) $(GTKINC)
-+LIBS = $(X11LIB) $(GTKLIB)
-
- # flags
--CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS = -g ${LIBS}
-+CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE
-+CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
-+LDFLAGS += $(LIBS)
-
- # Solaris
--#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
--#LDFLAGS = ${LIBS}
-+#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
-+#LDFLAGS = $(LIBS)
-
- # compiler and linker
--CC = cc
-+CC ?= gcc
---- a/Makefile
-+++ b/Makefile
-@@ -4,58 +4,58 @@
- include config.mk
-
- SRC = surf.c
--OBJ = ${SRC:.c=.o}
-+OBJ = $(SRC:.c=.o)
-
- all: options surf
-
- options:
- @echo surf build options:
-- @echo "CFLAGS = ${CFLAGS}"
-- @echo "LDFLAGS = ${LDFLAGS}"
-- @echo "CC = ${CC}"
-+ @echo "CFLAGS = $(CFLAGS)"
-+ @echo "LDFLAGS = $(LDFLAGS)"
-+ @echo "CC = $(CC)"
-
- .c.o:
- @echo CC $<
-- @${CC} -c ${CFLAGS} $<
-+ $(CC) -c $(CFLAGS) $<
-
--${OBJ}: config.h config.mk
-+$(OBJ): config.h config.mk
-
- config.h:
- @echo creating $@ from config.def.h
-- @cp config.def.h $@
-+ cp config.def.h $@
-
--surf: ${OBJ}
-+surf: $(OBJ)
- @echo CC -o $@
-- @${CC} -o $@ surf.o ${LDFLAGS}
-+ $(CC) -o $@ surf.o $(LDFLAGS)
-
- clean:
- @echo cleaning
-- @rm -f surf ${OBJ} surf-${VERSION}.tar.gz
-+ rm -f surf $(OBJ) surf-$(VERSION).tar.gz
-
- dist: clean
- @echo creating dist tarball
-- @mkdir -p surf-${VERSION}
-- @cp -R LICENSE Makefile config.mk config.def.h README \
-+ mkdir -p surf-$(VERSION)
-+ cp -R LICENSE Makefile config.mk config.def.h README \
- surf-open.sh arg.h TODO.md surf.png \
-- surf.1 ${SRC} surf-${VERSION}
-- @tar -cf surf-${VERSION}.tar surf-${VERSION}
-- @gzip surf-${VERSION}.tar
-- @rm -rf surf-${VERSION}
-+ surf.1 $(SRC) surf-$(VERSION)
-+ tar -cf surf-$(VERSION).tar surf-$(VERSION)
-+ gzip surf-$(VERSION).tar
-+ rm -rf surf-$(VERSION)
-
- install: all
-- @echo installing executable file to ${DESTDIR}${PREFIX}/bin
-- @mkdir -p ${DESTDIR}${PREFIX}/bin
-- @cp -f surf ${DESTDIR}${PREFIX}/bin
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf
-- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
-- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
-+ @echo installing executable file to $(DESTDIR)$(PREFIX)/bin
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin
-+ cp -f surf $(DESTDIR)$(PREFIX)/bin
-+ chmod 755 $(DESTDIR)$(PREFIX)/bin/surf
-+ @echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1
-+ mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-+ sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1
-+ chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1
-
- uninstall:
-- @echo removing executable file from ${DESTDIR}${PREFIX}/bin
-- @rm -f ${DESTDIR}${PREFIX}/bin/surf
-- @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-- @rm -f ${DESTDIR}${MANPREFIX}/man1/surf.1
-+ @echo removing executable file from $(DESTDIR)$(PREFIX)/bin
-+ rm -f $(DESTDIR)$(PREFIX)/bin/surf
-+ @echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1
-+ rm -f $(DESTDIR)$(MANPREFIX)/man1/surf.1
-
- .PHONY: all options clean dist install uninstall
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 812af57c997..d1f50b0fdae 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
)
"
PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${PN}-2.0-gentoo.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/, www-client/surf/
@ 2017-07-21 17:06 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2017-07-21 17:06 UTC (permalink / raw
To: gentoo-commits
commit: 0a22ad5e10ecb7b4c739cc33febfa9f1b7bba983
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 17:06:00 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 17:06:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a22ad5e
www-client/surf: Switch live ebuild to 2.0 branch.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
www-client/surf/files/surf-9999-gentoo.patch | 80 ++++++++++++++++++++++++++++
www-client/surf/surf-9999.ebuild | 6 ++-
2 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
new file mode 100644
index 00000000000..46f8fe3abb5
--- /dev/null
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -0,0 +1,80 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,25 +4,25 @@
+ # Customize below to fit your system
+
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = $(PREFIX)/share/man
+ LIBPREFIX = $(PREFIX)/lib/surf
+
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++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`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0 webkit2gtk-4.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-2.0 webkit2gtk-4.0)
+
+ # includes and libs
+-INCS = -I$(X11INC) $(GTKINC)
+-LIBS = -L$(X11LIB) -lX11 $(GTKLIB) -lgthread-2.0
++INCS = -I. -I/usr/include ${X11INC} ${GTKINC}
++LIBS = ${X11LIB} ${GTKLIB}
+
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" \
+ -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
+ SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
+-SURF_LDFLAGS = $(LIBS) $(LDFLAGS)
++SURF_LDFLAGS = $(LDFLAGS) $(LIBS)
+
+ # Solaris
+ #CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
+--- a/Makefile
++++ b/Makefile
+@@ -16,18 +16,16 @@
+ @echo "CC = $(CC)"
+
+ .c.o:
+- @echo CC -c $<
+- @$(CC) $(SURF_CFLAGS) -c $<
++ $(CC) $(SURF_CFLAGS) -c $<
+
+ $(OBJ): config.h config.mk
+
+ config.h:
+ @echo creating $@ from config.def.h
+- @cp config.def.h $@
++ cp config.def.h $@
+
+ surf: $(OBJ)
+- @echo CC -o $@
+- @$(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS)
++ $(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS)
+
+ clean:
+ @echo cleaning
+@@ -49,13 +47,13 @@
+
+ install: all
+ @echo installing executable file to $(DESTDIR)$(PREFIX)/bin
+- @mkdir -p $(DESTDIR)$(PREFIX)/bin
+- @cp -f surf $(DESTDIR)$(PREFIX)/bin
+- @chmod 755 $(DESTDIR)$(PREFIX)/bin/surf
++ mkdir -p $(DESTDIR)$(PREFIX)/bin
++ cp -f surf $(DESTDIR)$(PREFIX)/bin
++ chmod 755 $(DESTDIR)$(PREFIX)/bin/surf
+ @echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1
+- @mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+- @sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1
+- @chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1
++ mkdir -p $(DESTDIR)$(MANPREFIX)/man1
++ sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1
++ chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1
+
+ uninstall:
+ @echo removing executable file from $(DESTDIR)$(PREFIX)/bin
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 0d9f1a3dc18..7d8051ce2c7 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -7,15 +7,17 @@ inherit git-r3 savedconfig toolchain-funcs
DESCRIPTION="a simple web browser based on WebKit/GTK+"
HOMEPAGE="http://surf.suckless.org/"
EGIT_REPO_URI="git://git.suckless.org/surf"
+EGIT_BRANCH="surf-webkit2"
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
COMMON_DEPEND="
+ app-crypt/gcr
dev-libs/glib:2
net-libs/libsoup
- net-libs/webkit-gtk:3
+ net-libs/webkit-gtk:4
x11-libs/gtk+:3
x11-libs/libX11
"
@@ -34,7 +36,7 @@ RDEPEND="
)
"
PATCHES=(
- "${FILESDIR}"/${PN}-2.0-gentoo.patch
+ "${FILESDIR}"/${PN}-9999-gentoo.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/, www-client/surf/
@ 2023-04-05 12:30 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2023-04-05 12:30 UTC (permalink / raw
To: gentoo-commits
commit: bb08ba37f6caa05dd4367f11528fca848a607f90
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Mar 27 18:52:47 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 5 12:30:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb08ba37
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 <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/30373
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
www-client/surf/files/surf-2.1-gentoo.patch | 28 ---------
www-client/surf/surf-2.1-r2.ebuild | 98 -----------------------------
2 files changed, 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-05 12:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-29 4:19 [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/, www-client/surf/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2023-04-05 12:30 Joonas Niilola
2017-07-21 17:06 Jeroen Roovers
2015-12-28 7:38 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox