v3.4.11

3 files changed, 7 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35256100ea5a..7d2dec66a620 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = huggle
 	pkgdesc = Anti-vandalism tool for use on MediaWiki-based projects
-	pkgver = 3.4.10
-	pkgrel = 2
+	pkgver = 3.4.11
+	pkgrel = 1
 	url = https://en.wikipedia.org/wiki/Wikipedia:Huggle
 	arch = i686
 	arch = x86_64
@@ -11,12 +11,10 @@ pkgbase = huggle
 	depends = qt5-webengine
 	depends = yaml-cpp
 	conflicts = libircclient
-	source = https://github.com/huggle/huggle3-qt-lx/releases/download/3.4.10/huggle_3.4.10.tar.gz
-	source = huggle-yaml.patch
+	source = https://github.com/huggle/huggle3-qt-lx/releases/download/3.4.11/huggle_3.4.11.tar.gz
 	source = huggle-extensions.patch
 	source = huggle-desktop.patch
-	b2sums = 9a628a6a353f3b6e6c3c93d970116f87efd400f757cb2e0c1a603603aec70ee8da8a4ac45faa9769416070c18b11bbbcc23f5cefd7d119366ccfa6bc0c8a31d0
-	b2sums = e33e9f0d6dcab64194574c3963a4fb3ccaea71252190359d86ab8b6eb7c0676b9f27e0818530342cc23d42dbcdd40bae1e5f1a3391cd676c7802bf7604eb10e7
+	b2sums = edefaa67a87b4cb439bf7de45c1ac67c47cad8410cd598cb0c30074bf962041a43449c55a3d4caf7b6fb1ee645877b16388bcb9a6fed43c8deb85c582feddbcc
 	b2sums = e37d338085329911277cabd58108a0be5114b2c3b0469d0e3ed4bfbabda02c85315698c1ce466cb3c9bb25adb4ba208f69a134b4eb9079a2f70b8a36815f077a
 	b2sums = 4fa21457d39061bbba01c2e5f5ac9d6d703b56103fac82e48cff09d94b5ca4fe9a912756dad2c7c90079e556814654730b0c18f97f93de11b25b32ac740367ff
 
diff --git a/PKGBUILD b/PKGBUILD
index 76d9f639b6fa..1282e858718c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Samuel Damashek <samuel dot damashek at gmail dot com>
 # Contributor: Alex Xu <alex_y_xu dot yahoo at ca>
 pkgname=huggle
-pkgver=3.4.10
-pkgrel=2
+pkgver=3.4.11
+pkgrel=1
 pkgdesc="Anti-vandalism tool for use on MediaWiki-based projects"
 arch=('i686' 'x86_64')
 url="https://en.wikipedia.org/wiki/Wikipedia:Huggle"
@@ -13,12 +13,10 @@ makedepends=('cmake')
 conflicts=('libircclient') # A different, unrelated, libircclient
 source=(
     "https://github.com/huggle/huggle3-qt-lx/releases/download/${pkgver}/${pkgname}_${pkgver}.tar.gz"
-    "huggle-yaml.patch"
     "huggle-extensions.patch"
     "huggle-desktop.patch"
 )
-b2sums=('9a628a6a353f3b6e6c3c93d970116f87efd400f757cb2e0c1a603603aec70ee8da8a4ac45faa9769416070c18b11bbbcc23f5cefd7d119366ccfa6bc0c8a31d0'
-        'e33e9f0d6dcab64194574c3963a4fb3ccaea71252190359d86ab8b6eb7c0676b9f27e0818530342cc23d42dbcdd40bae1e5f1a3391cd676c7802bf7604eb10e7'
+b2sums=('edefaa67a87b4cb439bf7de45c1ac67c47cad8410cd598cb0c30074bf962041a43449c55a3d4caf7b6fb1ee645877b16388bcb9a6fed43c8deb85c582feddbcc'
         'e37d338085329911277cabd58108a0be5114b2c3b0469d0e3ed4bfbabda02c85315698c1ce466cb3c9bb25adb4ba208f69a134b4eb9079a2f70b8a36815f077a'
         '4fa21457d39061bbba01c2e5f5ac9d6d703b56103fac82e48cff09d94b5ca4fe9a912756dad2c7c90079e556814654730b0c18f97f93de11b25b32ac740367ff')
 
@@ -26,8 +24,6 @@ prepare() {
     cd "${pkgname}_${pkgver}"
     # Patch extension directory to /usr/lib/huggle/extensions (T251049)
     patch --forward --strip=1 --input="../huggle-extensions.patch"
-    # Backport dependency fix from master, remove in 3.4.11
-    patch --forward --strip=1 --input="../huggle-yaml.patch"
     # Fix icon in huggle.desktop
     patch --forward --strip=1 --input="../huggle-desktop.patch"
     echo "+archlinux.${pkgrel}" >> src/huggle_core/version.txt
diff --git a/huggle-yaml.patch b/huggle-yaml.patch
deleted file mode 100644
index 1eba4ed19bf9..000000000000
--- a/huggle-yaml.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a37976e3..b7530e8f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -63,12 +63,19 @@ add_subdirectory(3rd/libirc/libirc libirc)
- add_subdirectory(3rd/libirc/libircclient libircclient)
- 
- # YAML
--option(YAML_CPP_BUILD_TOOLS "Disable tests" OFF)
--option(YAML_CPP_BUILD_TESTS "Enable testing" OFF)
--option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF)
--option(BUILD_SHARED_LIBS "Build as shared" ON)
--include_directories("3rd/yaml-cpp/include/")
--add_subdirectory(3rd/yaml-cpp)
-+find_package(YAML-CPP 0.6.3 QUIET)
-+if (YAML-CPP_FOUND)
-+    message(STATUS "Using system yaml-cpp")
-+    include_directories(YAML_CPP_INCLUDE_DIR)
-+else()
-+    option(YAML_CPP_BUILD_TOOLS "Disable tests" OFF)
-+    option(YAML_CPP_BUILD_TESTS "Enable testing" OFF)
-+    option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF)
-+    option(BUILD_SHARED_LIBS "Build as shared" ON)
-+    include_directories("3rd/yaml-cpp/include/")
-+    add_subdirectory(3rd/yaml-cpp)
-+endif()
-+
- if (HUGGLE_EXT)
-     if(NOT MINGW AND WIN32)
-         set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release/extensions)