Page MenuHomeFreeBSD
Differential D18990 Diff 53269 multimedia/obs-qtwebkit/files/patch-GNUmakefile

Changeset View

Standalone View

View Options

multimedia/obs-qtwebkit/files/patch-GNUmakefile

Temporary, see: Check libinotify via pkg-config as it maybe installed in non-default directories
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231108
--- GNUmakefile.orig 2018-09-02 22:04:19 UTC --- GNUmakefile.orig 2018-09-02 22:04:19 UTC
+++ GNUmakefile +++ GNUmakefile
@@ -5,7 +5,7 @@ ifndef OBS_LIB @@ -5,12 +5,12 @@ ifndef OBS_LIB
OBS_LIB = /usr/lib OBS_LIB = /usr/lib
endif endif
-CXXFLAGS = -std=c++11 -Wall -g -fPIC -I$(OBS_INCLUDE) -I./src $(shell pkg-config --cflags Qt5Widgets) $(shell pkg-config --cflags Qt5WebKit) $(shell pkg-config --cflags Qt5WebKitWidgets) -CXXFLAGS = -std=c++11 -Wall -g -fPIC -I$(OBS_INCLUDE) -I./src $(shell pkg-config --cflags Qt5Widgets) $(shell pkg-config --cflags Qt5WebKit) $(shell pkg-config --cflags Qt5WebKitWidgets)
+CXXFLAGS = -std=c++11 -Wall -g -fPIC -I$(OBS_INCLUDE) -I./src $(shell pkg-config --cflags Qt5Widgets) $(shell pkg-config --cflags Qt5WebKit) -I%%LOCALBASE%%/include/qt5/QtWebKitWidgets +CXXFLAGS = -std=c++11 -Wall -g -fPIC -I$(OBS_INCLUDE) -I./src $(shell pkg-config --cflags Qt5Widgets) $(shell pkg-config --cflags Qt5WebKit) $(shell pkg-config --cflags Qt5WebKitWidgets) $(shell pkg-config --cflags libinotify 2>/dev/null)
CXX ?= c++ CXX ?= c++
RM = /bin/rm -rf RM = /bin/rm -rf
LDFLAGS = -L$(OBS_LIB) LDFLAGS = -L$(OBS_LIB)
LDLIBS_LIB = -lobs -lrt
-LDLIBS_RENDERER = $(shell pkg-config --libs Qt5Widgets) $(shell pkg-config --libs Qt5WebKit) $(shell pkg-config --libs Qt5WebKitWidgets) -lrt -linotify
+LDLIBS_RENDERER = $(shell pkg-config --libs Qt5Widgets) $(shell pkg-config --libs Qt5WebKit) $(shell pkg-config --libs Qt5WebKitWidgets) $(shell pkg-config --libs libinotify 2>/dev/null) -lrt
LIB = build/qtwebkit-browser.so
LIB_OBJ = build/qtwebkit-main.o build/qtwebkit-source.o build/qtwebkit-manager.o