* [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/
@ 2019-01-24 11:16 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-01-24 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 3d7526126438321b384896854714614d0f15a755
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 11:15:43 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 11:15:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d752612
www-client/surf: Update live ebuild patch
Fixes: https://bugs.gentoo.org/669188
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
www-client/surf/files/surf-9999-gentoo.patch | 88 ++++++++++++----------------
1 file changed, 37 insertions(+), 51 deletions(-)
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
index 46f8fe3abb5..79c5964ed6a 100644
--- a/www-client/surf/files/surf-9999-gentoo.patch
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -1,80 +1,66 @@
--- a/config.mk
+++ b/config.mk
-@@ -4,25 +4,25 @@
+@@ -4,18 +4,18 @@
# Customize below to fit your system
# paths
-PREFIX = /usr/local
+PREFIX = /usr
MANPREFIX = $(PREFIX)/share/man
- LIBPREFIX = $(PREFIX)/lib/surf
+ LIBPREFIX = $(PREFIX)/lib
+ LIBDIR = $(LIBPREFIX)/surf
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
+-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`
-+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)
+-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
+-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-2.0)
++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
++WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-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}
-
+ INCS = $(X11INC) $(GTKINC)
+@@ -24,7 +24,7 @@
# flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" \
+ CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
-D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
- SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
--SURF_LDFLAGS = $(LIBS) $(LDFLAGS)
-+SURF_LDFLAGS = $(LDFLAGS) $(LIBS)
+-SURFCFLAGS = $(INCS) $(CPPFLAGS)
++SURFCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
+ WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
- # Solaris
- #CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
+ # compiler
--- a/Makefile
+++ b/Makefile
-@@ -16,18 +16,16 @@
- @echo "CC = $(CC)"
+@@ -9,7 +9,7 @@
+ WEBEXTSRC = libsurf-webext.c
+ WEBEXTOBJ = $(WEBEXTSRC:.c=.o)
- .c.o:
-- @echo CC -c $<
-- @$(CC) $(SURF_CFLAGS) -c $<
-+ $(CC) $(SURF_CFLAGS) -c $<
+-all: options libsurf-webext.so surf
++all: libsurf-webext.so surf
+
+ options:
+ @echo surf build options:
+@@ -19,7 +19,7 @@
+ @echo "LDFLAGS = $(LDFLAGS)"
- $(OBJ): config.h config.mk
+ .c.o:
+- $(CC) $(SURFCFLAGS) $(CFLAGS) -c $<
++ $(CC) $(WEBEXTCFLAGS) $(SURFCFLAGS) $(CFLAGS) -c $<
config.h:
- @echo creating $@ from config.def.h
-- @cp config.def.h $@
-+ cp config.def.h $@
+ cp config.def.h $@
+@@ -33,7 +33,7 @@
+ $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc
surf: $(OBJ)
-- @echo CC -o $@
-- @$(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS)
-+ $(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS)
+- $(CC) $(SURFLDLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
++ $(CC) $(WEBEXTLIBS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
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
+ rm -f surf $(OBJ)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/
@ 2019-02-07 11:13 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-02-07 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 13df6158e43d170a0dabf8934ec909f8a6b39631
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 11:11:10 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 11:13:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13df6158
www-client/surf: Fix live ebuild patch
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/677402
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
www-client/surf/files/surf-9999-gentoo.patch | 47 ++++------------------------
1 file changed, 6 insertions(+), 41 deletions(-)
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
index 79c5964ed6a..7b783e8feb8 100644
--- a/www-client/surf/files/surf-9999-gentoo.patch
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -1,6 +1,8 @@
+diff --git a/config.mk b/config.mk
+index 5e68e38..fa45b55 100644
--- a/config.mk
+++ b/config.mk
-@@ -4,18 +4,18 @@
+@@ -4,18 +4,18 @@ VERSION = 2.0
# Customize below to fit your system
# paths
@@ -19,48 +21,11 @@
-GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0)
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-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)
+WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
# includes and libs
INCS = $(X11INC) $(GTKINC)
-@@ -24,7 +24,7 @@
- # flags
- CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
- -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
--SURFCFLAGS = $(INCS) $(CPPFLAGS)
-+SURFCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
- WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
-
- # compiler
---- a/Makefile
-+++ b/Makefile
-@@ -9,7 +9,7 @@
- WEBEXTSRC = libsurf-webext.c
- WEBEXTOBJ = $(WEBEXTSRC:.c=.o)
-
--all: options libsurf-webext.so surf
-+all: libsurf-webext.so surf
-
- options:
- @echo surf build options:
-@@ -19,7 +19,7 @@
- @echo "LDFLAGS = $(LDFLAGS)"
-
- .c.o:
-- $(CC) $(SURFCFLAGS) $(CFLAGS) -c $<
-+ $(CC) $(WEBEXTCFLAGS) $(SURFCFLAGS) $(CFLAGS) -c $<
-
- config.h:
- cp config.def.h $@
-@@ -33,7 +33,7 @@
- $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc
-
- surf: $(OBJ)
-- $(CC) $(SURFLDLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
-+ $(CC) $(WEBEXTLIBS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
-
- clean:
- rm -f surf $(OBJ)
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/
@ 2020-11-22 13:19 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-11-22 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 69d796c341cf1ae78d883b64e742c72b0cf97f82
Author: parazyd <parazyd <AT> dyne <DOT> org>
AuthorDate: Sun Nov 22 13:18:15 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 13:19:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d796c3
www-client/surf: Rebase 9999 patch.
Signed-off-by: Ivan Jelincic <parazyd <AT> dyne.org>
Closes: https://github.com/gentoo/gentoo/pull/18267
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
www-client/surf/files/surf-9999-gentoo.patch | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
index 7b783e8feb8..30111395f00 100644
--- a/www-client/surf/files/surf-9999-gentoo.patch
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -1,5 +1,5 @@
diff --git a/config.mk b/config.mk
-index 5e68e38..fa45b55 100644
+index f1910bf..55d7066 100644
--- a/config.mk
+++ b/config.mk
@@ -4,18 +4,18 @@ VERSION = 2.0
@@ -19,13 +19,12 @@ index 5e68e38..fa45b55 100644
-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`
--WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-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)
-+WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-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)
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/
@ 2021-03-18 11:15 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-03-18 11:15 UTC (permalink / raw
To: gentoo-commits
commit: cb5b11dc1f76153067fdad889c05095768725233
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Mar 17 15:23:54 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 18 11:07:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5b11dc
www-client/surf: Respect CFLAGS and LDFLAGS
Closes: https://bugs.gentoo.org/742602
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/13568
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
www-client/surf/files/surf-2.0-gentoo.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch
index 07aa6568f55..b0a7b5c8ef0 100644
--- a/www-client/surf/files/surf-2.0-gentoo.patch
+++ b/www-client/surf/files/surf-2.0-gentoo.patch
@@ -29,8 +29,8 @@
CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
-+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS = ${LIBS}
++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS += ${LIBS}
# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-18 11:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-18 11:15 [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2020-11-22 13:19 Joonas Niilola
2019-02-07 11:13 Jeroen Roovers
2019-01-24 11:16 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox