Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 450490 Details for
Bug 584190
www-client/surf should depend on net-libs/webkit-gtk:4
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
surf-webkit2 patch
surf-webkit2-9999-gentoo.patch (text/plain), 4.18 KB, created by
Adam
on 2016-10-16 21:21:44 UTC
(
hide
)
Description:
surf-webkit2 patch
Filename:
MIME Type:
Creator:
Adam
Created:
2016-10-16 21:21:44 UTC
Size:
4.18 KB
patch
obsolete
>diff -Nru old/Makefile new/Makefile >--- old/Makefile 2016-10-12 22:06:45.520007371 +0200 >+++ new/Makefile 2016-10-12 22:50:13.920008614 +0200 >@@ -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 -Nru old/config.mk new/config.mk >--- old/config.mk 2016-10-12 22:07:55.550007404 +0200 >+++ new/config.mk 2016-10-16 22:46:18.280038801 +0200 >@@ -4,28 +4,29 @@ > # Customize below to fit your system > > # paths >-PREFIX = /usr/local >-MANPREFIX = ${PREFIX}/share/man >-LIBPREFIX = ${PREFIX}/lib/surf >+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 webkit2gtk-4.0` >-GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0` >+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gthread-2.0 webkit2gtk-4.0) >+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gthread-2.0 webkit2gtk-4.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}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE >-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} >-LDFLAGS = -s ${LIBS} >+CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBPREFIX)\" -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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 584190
:
450488
|
450490