Bump to 1.1.0. Remove the fix_libxml_2.0.12.patch, not needed anymore

4 files changed, 22 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aacaad7f0bcd..1d4c1e521003 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pgmodeler
 	pkgdesc = PostgreSQL Database Modeler: an open source CASE tool for modeling PostgreSQL databases
-	pkgver = 1.0.6
+	pkgver = 1.1.0
 	pkgrel = 1
 	epoch = 3
 	url = https://pgmodeler.io
@@ -11,17 +11,15 @@ pkgbase = pgmodeler
 	depends = postgresql-libs
 	depends = libxml2
 	options = emptydirs
-	source = pgmodeler-1.0.6.tar.gz::https://github.com/pgmodeler/pgmodeler/archive/v1.0.6.tar.gz
+	source = pgmodeler-1.1.0.tar.gz::https://github.com/pgmodeler/pgmodeler/archive/v1.1.0.tar.gz
 	source = mimetype.xml
 	source = pgmodeler.install
 	source = patch_no_check_update.diff
-	source = fix_libxml_2.0.12.patch
 	source = pgmodeler.appdata.xml
-	sha256sums = cfc80f9311e6c3863b80fdf9891793f00da3362f5c016331831e7b35b4681ab9
+	sha256sums = a72fd207a89eef0e1e05938e1b89b94b72cc9ae31364b35409ddfc10bc5ad8d7
 	sha256sums = 91c6ab0df840823a4de21a953592134fb7b4367565eebff8523dc08ea6c7cd36
 	sha256sums = fed8d615a3b732a83e1bd9c9562c81f3bfcb0ce5a4abba96191bca0d602bdd33
-	sha256sums = 740f785beedc87f6e50f48a7c89f6fae83ac25c57b242531feaf835bd34d3b02
-	sha256sums = 60437a0ea43b7dbbf500cad3e67692207810a6896ca99f867077d21012e918f6
+	sha256sums = 208a17f95189d032808a2ff5bc04b181c92a524d6ce87c914264a93c594c1d35
 	sha256sums = 047466a4841cb312d2660ed53875fb34437017bec87c134f9048b542e381e30a
 
 pkgname = pgmodeler
diff --git a/PKGBUILD b/PKGBUILD
index cda59448a57b..26a13fb84c92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Severin Glöckner (severin.gloeckner@stud.htwk-leipzig.de)
 
 pkgname=pgmodeler
-pkgver=1.0.6
+pkgver=1.1.0
 pkgrel=1
 epoch=3
 pkgdesc="PostgreSQL Database Modeler: an open source CASE tool for modeling PostgreSQL databases"
@@ -15,13 +15,11 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v
         'mimetype.xml'
         'pgmodeler.install'
         'patch_no_check_update.diff'
-        'fix_libxml_2.0.12.patch'
         'pgmodeler.appdata.xml')
-sha256sums=('cfc80f9311e6c3863b80fdf9891793f00da3362f5c016331831e7b35b4681ab9'
+sha256sums=('a72fd207a89eef0e1e05938e1b89b94b72cc9ae31364b35409ddfc10bc5ad8d7'
             '91c6ab0df840823a4de21a953592134fb7b4367565eebff8523dc08ea6c7cd36'
             'fed8d615a3b732a83e1bd9c9562c81f3bfcb0ce5a4abba96191bca0d602bdd33'
-            '740f785beedc87f6e50f48a7c89f6fae83ac25c57b242531feaf835bd34d3b02'
-            '60437a0ea43b7dbbf500cad3e67692207810a6896ca99f867077d21012e918f6'
+            '208a17f95189d032808a2ff5bc04b181c92a524d6ce87c914264a93c594c1d35'
             '047466a4841cb312d2660ed53875fb34437017bec87c134f9048b542e381e30a')
 
 options=('emptydirs')
@@ -31,7 +29,6 @@ install=pgmodeler.install
 build() {
     cd "$srcdir/$pkgname-${pkgver//_/-}"
     patch -p1 < ../patch_no_check_update.diff
-    patch -p1 < ../fix_libxml_2.0.12.patch
 
     # release is needed to get the full dummy and xml2object plugins (doesn't seem to work)
     qmake6 CONFIG+=release \
diff --git a/fix_libxml_2.0.12.patch b/fix_libxml_2.0.12.patch
deleted file mode 100644
index d3b96e442ef4..000000000000
--- a/fix_libxml_2.0.12.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -c pgmodeler-1.0.6-orig/libs/libparsers/src/xmlparser.cpp pgmodeler-1.0.6/libs/libparsers/src/xmlparser.cpp
-*** pgmodeler-1.0.6-orig/libs/libparsers/src/xmlparser.cpp	2023-11-23 18:26:48.597362645 +0100
---- pgmodeler-1.0.6/libs/libparsers/src/xmlparser.cpp	2023-11-23 18:27:21.644351113 +0100
-***************
-*** 152,158 ****
-  {
-  	QByteArray buffer;
-  	QString msg, file;
-! 	xmlError *xml_error=nullptr;
-  	int parser_opt;
-  
-  	if(!xml_buffer.isEmpty())
---- 152,158 ----
-  {
-  	QByteArray buffer;
-  	QString msg, file;
-! 	xmlError const *xml_error=nullptr;
-  	int parser_opt;
-  
-  	if(!xml_buffer.isEmpty())
diff --git a/patch_no_check_update.diff b/patch_no_check_update.diff
index 6562013ef760..b4bc5fddc3ca 100644
--- a/patch_no_check_update.diff
+++ b/patch_no_check_update.diff
@@ -1,37 +1,37 @@
-diff -c -r pgmodeler-0.9.4-alpha1-orig/assets/conf/defaults/general.conf pgmodeler-0.9.4-alpha1/assets/conf/defaults/general.conf
-*** pgmodeler-0.9.4-alpha1-orig/assets/conf/defaults/general.conf	2021-07-22 11:59:37.184473344 +0200
---- pgmodeler-0.9.4-alpha1/assets/conf/defaults/general.conf	2021-07-22 12:00:24.371236247 +0200
+diff -c -r pgmodeler-1.1.0/assets/conf/defaults/general.conf pgmodeler-1.1.0-new/assets/conf/defaults/general.conf
+*** pgmodeler-1.1.0/assets/conf/defaults/general.conf	2024-02-23 14:31:35.000000000 +0100
+--- pgmodeler-1.1.0-new/assets/conf/defaults/general.conf	2024-02-26 10:27:14.174593458 +0100
 ***************
-*** 22,28 ****
-                 code-tab-width="4"
+*** 15,21 ****
+                 hide-ext-attribs="false"
                  canvas-corner-move="true"
                  invert-rangesel-trigger="false"
 !                check-update="true"
                  check-versions="all"                 
                  save-last-position="true"
                  show-main-menu="false"
---- 22,28 ----
-                 code-tab-width="4"
+--- 15,21 ----
+                 hide-ext-attribs="false"
                  canvas-corner-move="true"
                  invert-rangesel-trigger="false"
-!                check-update="false"
+!                falsecheck-update="false"
                  check-versions="all"                 
                  save-last-position="true"
                  show-main-menu="false"
-diff -c -r pgmodeler-0.9.4-alpha1-orig/assets/conf/general.conf pgmodeler-0.9.4-alpha1/assets/conf/general.conf
-*** pgmodeler-0.9.4-alpha1-orig/assets/conf/general.conf	2021-07-22 11:59:37.184473344 +0200
---- pgmodeler-0.9.4-alpha1/assets/conf/general.conf	2021-07-22 12:00:38.354598103 +0200
+diff -c -r pgmodeler-1.1.0/assets/conf/general.conf pgmodeler-1.1.0-new/assets/conf/general.conf
+*** pgmodeler-1.1.0/assets/conf/general.conf	2024-02-23 14:31:35.000000000 +0100
+--- pgmodeler-1.1.0-new/assets/conf/general.conf	2024-02-26 10:27:27.152735838 +0100
 ***************
-*** 22,28 ****
-                 code-tab-width="4"
+*** 15,21 ****
+                 hide-ext-attribs="false"
                  canvas-corner-move="true"
                  invert-rangesel-trigger="false"
 !                check-update="true"
                  check-versions="all"                 
                  save-last-position="true"
                  show-main-menu="false"
---- 22,28 ----
-                 code-tab-width="4"
+--- 15,21 ----
+                 hide-ext-attribs="false"
                  canvas-corner-move="true"
                  invert-rangesel-trigger="false"
 !                check-update="false"