summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormarco442023-11-23 18:33:36 +0100
committermarco442023-11-23 18:34:59 +0100
commitccf369e8f78b2e7e2ba49f81bcba0a71d39e7cdb (patch)
treef94c8a8717216f5b7d9ba332abf3a0cf3adbc6bf
parentb1a166e898761f7a8472569c8dc1229e86855104 (diff)
downloadaur-ccf369e8f78b2e7e2ba49f81bcba0a71d39e7cdb.tar.gz
Workaround for libxml 2.12, for now
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD3
-rw-r--r--fix_libxml_2.0.12.patch20
3 files changed, 25 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 55469aabbf7a..4fcf5e249446 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,11 +15,13 @@ pkgbase = pgmodeler
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 = 91c6ab0df840823a4de21a953592134fb7b4367565eebff8523dc08ea6c7cd36
sha256sums = fed8d615a3b732a83e1bd9c9562c81f3bfcb0ce5a4abba96191bca0d602bdd33
sha256sums = 740f785beedc87f6e50f48a7c89f6fae83ac25c57b242531feaf835bd34d3b02
+ sha256sums = 148f86776609fc3d5155c875deb9e0048e043a63b6b4e145412f2f0bb4037653
sha256sums = 047466a4841cb312d2660ed53875fb34437017bec87c134f9048b542e381e30a
pkgname = pgmodeler
diff --git a/PKGBUILD b/PKGBUILD
index 8f290cca4f7a..8f6a175689f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,11 +15,13 @@ 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'
'91c6ab0df840823a4de21a953592134fb7b4367565eebff8523dc08ea6c7cd36'
'fed8d615a3b732a83e1bd9c9562c81f3bfcb0ce5a4abba96191bca0d602bdd33'
'740f785beedc87f6e50f48a7c89f6fae83ac25c57b242531feaf835bd34d3b02'
+ '148f86776609fc3d5155c875deb9e0048e043a63b6b4e145412f2f0bb4037653'
'047466a4841cb312d2660ed53875fb34437017bec87c134f9048b542e381e30a')
options=('emptydirs')
@@ -29,6 +31,7 @@ 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
new file mode 100644
index 000000000000..e4c99bfad96a
--- /dev/null
+++ b/fix_libxml_2.0.12.patch
@@ -0,0 +1,20 @@
+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;
+! const xmlError *xml_error=nullptr;
+ int parser_opt;
+
+ if(!xml_buffer.isEmpty())