Skip to content

Commit

Permalink
config.mk: link against webkit-gtk 4.1
Browse files Browse the repository at this point in the history
The webkit-gtk project has released a new minor version bump of their
API with version 4.1. The difference between 4.0 and 4.1 is that the
former links against libsoup 2.x, whereas the latter links against
libsoup 3.0 and newer. As libsoup has introduced backwards-incompatible
changes in 3.0 it will cause the process to hard-crash if a program is
linked against both libraries at the same time.

Now that we have ported vimb to be compatible with libsoup 3.0 we can
start to link against the recent webkit-gtk 4.1.
  • Loading branch information
pks-t authored and fanglingsu committed Dec 24, 2022
1 parent 243a1c7 commit 8b85f98
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ branches:
gh-pages

language: c
dist: bionic
dist: jammy
sudo: required

compiler:
Expand All @@ -12,6 +12,6 @@ compiler:

before_install:
- sudo apt-get update -q
- sudo apt-get install -y --allow-unauthenticated --no-install-recommends libwebkit2gtk-4.0-dev
- sudo apt-get install -y --allow-unauthenticated --no-install-recommends libwebkit2gtk-4.1-dev

script: make options && make -j test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ the project page of [Vimb][].
## dependencies

- gtk+-3.0
- webkit2gtk-4.0 >= 2.20.x
- webkit2gtk-4.1
- gst-libav, gst-plugins-good (optional, for media decoding among other things)

## Install
Expand Down
6 changes: 3 additions & 3 deletions config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SRCDIR = src
DOCDIR = doc

# used libs
LIBS = gtk+-3.0 'webkit2gtk-4.0 >= 2.20.0'
LIBS = gtk+-3.0 webkit2gtk-4.1

# setup general used CFLAGS
CFLAGS += -std=c99 -pipe -Wall -fPIC
Expand All @@ -34,9 +34,9 @@ endif

# flags used to build webextension
EXTTARGET = webext_main.so
EXTCFLAGS = ${CFLAGS} $(shell pkg-config --cflags webkit2gtk-web-extension-4.0)
EXTCFLAGS = ${CFLAGS} $(shell pkg-config --cflags webkit2gtk-web-extension-4.1)
EXTCPPFLAGS = $(CPPFLAGS)
EXTLDFLAGS = ${LDFLAGS} $(shell pkg-config --libs webkit2gtk-web-extension-4.0) -shared
EXTLDFLAGS = ${LDFLAGS} $(shell pkg-config --libs webkit2gtk-web-extension-4.1) -shared

# flags used for the main application
CFLAGS += $(shell pkg-config --cflags $(LIBS))
Expand Down

0 comments on commit 8b85f98

Please sign in to comment.