Splitting webkitgtk and webkitgtk2.

2 files changed, 34 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4af031d52b27..d587346580d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = webkitgtk
-	pkgdesc = Legacy Web content engine
+	pkgdesc = Legacy Web content engine for GTK+ 3
 	pkgver = 2.4.11
-	pkgrel = 15
+	pkgrel = 16
 	epoch = 3
 	url = https://webkitgtk.org/
 	install = webkitgtk.install
@@ -19,6 +19,7 @@ pkgbase = webkitgtk
 	depends = enchant>=2.2
 	depends = geoclue2
 	depends = gst-plugins-base-libs
+	depends = gtk3
 	depends = harfbuzz-icu
 	depends = libgl
 	depends = libsecret
@@ -28,6 +29,13 @@ pkgbase = webkitgtk
 	optdepends = gst-libav: nonfree media decoding
 	optdepends = gst-plugins-base: free media decoding
 	optdepends = gst-plugins-good: media decoding
+	optdepends = gtk2: Netscape plugin support
+	provides = webkitgtk3=2.4.11
+	provides = libwebkit3=2.4.11
+	conflicts = webkitgtk3
+	conflicts = libwebkit3
+	replaces = webkitgtk3
+	replaces = libwebkit3
 	options = !emptydirs
 	source = https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz
 	source = webkitgtk-2.4.9-abs.patch
@@ -41,41 +49,4 @@ pkgbase = webkitgtk
 	sha256sums = a1e2f24b28273746b2fbaecef42495f6314c76b16a446c22dc123e6a3afb58c8
 
 pkgname = webkitgtk
-	pkgdesc = Legacy Web content engine for GTK+ 3
-	depends = enchant>=2.2
-	depends = geoclue2
-	depends = gst-plugins-base-libs
-	depends = harfbuzz-icu
-	depends = libgl
-	depends = libsecret
-	depends = libwebp
-	depends = libxslt
-	depends = libxt
-	depends = gtk3
-	optdepends = gst-libav: nonfree media decoding
-	optdepends = gst-plugins-base: free media decoding
-	optdepends = gst-plugins-good: media decoding
-	optdepends = gtk2: Netscape plugin support
-	provides = webkitgtk3=2.4.11
-	provides = libwebkit3=2.4.11
-	conflicts = webkitgtk3
-	conflicts = libwebkit3
-	replaces = webkitgtk3
-	replaces = libwebkit3
-
-pkgname = webkitgtk2
-	pkgdesc = Legacy Web content engine for GTK+ 2
-	depends = enchant>=2.2
-	depends = geoclue2
-	depends = gst-plugins-base-libs
-	depends = harfbuzz-icu
-	depends = libgl
-	depends = libsecret
-	depends = libwebp
-	depends = libxslt
-	depends = libxt
-	depends = gtk2
-	provides = libwebkit=2.4.11
-	conflicts = libwebkit
-	replaces = libwebkit
 
diff --git a/PKGBUILD b/PKGBUILD
index 7dbd778fe292..0be314d2e269 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,27 @@
 # Contributor: foutrelis
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
-pkgbase=webkitgtk
-pkgname=(webkitgtk webkitgtk2)
+pkgname=webkitgtk
 pkgver=2.4.11
-pkgrel=15
+pkgrel=16
 epoch=3
-pkgdesc="Legacy Web content engine"
+pkgdesc="Legacy Web content engine for GTK+ 3"
 arch=("armv7h" "i686" "x86_64")
-url="https://${pkgbase}.org/"
+url="https://${pkgname}.org/"
 license=("custom")
-depends=("enchant>=2.2" "geoclue2" "gst-plugins-base-libs" "harfbuzz-icu" "libgl" "libsecret" "libwebp" "libxslt" "libxt")
+depends=("enchant>=2.2" "geoclue2" "gst-plugins-base-libs" "gtk3" "harfbuzz-icu" "libgl" "libsecret" "libwebp" "libxslt" "libxt")
 optdepends=("gst-libav: nonfree media decoding"
             "gst-plugins-base: free media decoding"
-            "gst-plugins-good: media decoding")
+            "gst-plugins-good: media decoding"
+            "gtk2: Netscape plugin support")
 makedepends=("gobject-introspection" "gperf" "gtk2" "gtk3" "mesa" "python2" "ruby")
+provides=("${pkgname}3=${pkgver}" "libwebkit3=${pkgver}")
+conflicts=("${pkgname}3" "libwebkit3")
+replaces=("${pkgname}3" "libwebkit3")
 options=("!emptydirs")
-install="${pkgbase}.install"
-source=("https://${pkgbase}.org/releases/${pkgbase}-${pkgver}.tar.xz"
-        "${pkgbase}-2.4.9-abs.patch"
+install="${pkgname}.install"
+source=("https://${pkgname}.org/releases/${pkgname}-${pkgver}.tar.xz"
+        "${pkgname}-2.4.9-abs.patch"
         "enchant-2.x.patch"
         "icu59.patch"
         "pkgconfig-enchant-2.patch")
@@ -31,11 +34,11 @@ sha256sums=("588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7"
             "a1e2f24b28273746b2fbaecef42495f6314c76b16a446c22dc123e6a3afb58c8")
 
 prepare() {
-  mkdir -p "${srcdir}/build-gtk"{,2} "${srcdir}/path"
+  mkdir -p "${srcdir}/build-gtk" "${srcdir}/path"
   ln -rTsf "/usr/bin/python2" "${srcdir}/path/python"
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np1 -i "${srcdir}/${pkgbase}-2.4.9-abs.patch"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/${pkgname}-2.4.9-abs.patch"
   patch -Np1 -i "${srcdir}/enchant-2.x.patch"
   patch -Np1 -i "${srcdir}/icu59.patch"
   # https://www.archlinux.org/todo/enchant-221-rebuild/
@@ -45,10 +48,8 @@ prepare() {
   autoreconf -ifv
 }
 
-_build() (
-  _ver="${1}"; shift
-
-  cd "${srcdir}/build-${_ver}"
+build() (
+  cd "${srcdir}/build-gtk"
 
   PATH="${srcdir}/path:${PATH}"
 
@@ -58,44 +59,20 @@ _build() (
   CFLAGS+=" -Wno-expansion-to-defined -Wno-class-memaccess"
   CXXFLAGS+=" -Wno-expansion-to-defined -Wno-class-memaccess"
 
-  "${srcdir}/${pkgbase}-${pkgver}/configure" \
+  "${srcdir}/${pkgname}-${pkgver}/configure" \
     --prefix=/usr \
-    --libexecdir=/usr/lib/webkit${_ver} \
+    --libexecdir=/usr/lib/${pkgname} \
     --enable-introspection \
     --disable-webkit2 \
-    --disable-gtk-doc \
-    "$@"
+    --disable-gtk-doc
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i "s/ -shared / -Wl,-O1,--as-needed\0/g" "${srcdir}/build-${_ver}/libtool"
+  sed -i "s/ -shared / -Wl,-O1,--as-needed\0/g" "${srcdir}/build-gtk/libtool"
 
   make all stamp-po
 )
 
-build() {
-  _build "gtk"
-  _build "gtk2" --with-gtk=2.0
-}
-
-package_webkitgtk() {
-  pkgdesc+=" for GTK+ 3"
-  depends+=("gtk3")
-  optdepends+=("gtk2: Netscape plugin support")
-  provides=("${pkgbase}3=${pkgver}" "libwebkit3=${pkgver}")
-  conflicts=("${pkgbase}3" "libwebkit3")
-  replaces=("${pkgbase}3" "libwebkit3")
-
+package() {
   make -C "${srcdir}/build-gtk" DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/Source/WebKit/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_webkitgtk2() {
-  pkgdesc+=" for GTK+ 2"
-  depends+=("gtk2")
-  provides=("libwebkit=${pkgver}")
-  conflicts=("libwebkit")
-  replaces=("libwebkit")
-
-  make -C "${srcdir}/build-gtk2" DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/Source/WebKit/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/Source/WebKit/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }