From 0e63e2ec0b2cbcbb83132bd1b9c3a899d5d0b9ca Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Wed, 2 Apr 2025 20:14:19 +0300 Subject: [PATCH] pgmodeler: update to 1.2.0 --- ...0002-pgmodeler-1.0.2-no-check-update.patch | 13 ----- ...gmodeler-1.0.2-fix-global-attributes.patch | 50 +++++++++---------- mingw-w64-pgmodeler/PKGBUILD | 12 ++--- 3 files changed, 31 insertions(+), 44 deletions(-) diff --git a/mingw-w64-pgmodeler/0002-pgmodeler-1.0.2-no-check-update.patch b/mingw-w64-pgmodeler/0002-pgmodeler-1.0.2-no-check-update.patch index edffefb1e5..3666c87cec 100644 --- a/mingw-w64-pgmodeler/0002-pgmodeler-1.0.2-no-check-update.patch +++ b/mingw-w64-pgmodeler/0002-pgmodeler-1.0.2-no-check-update.patch @@ -1,16 +1,3 @@ -diff --git a/assets/conf/defaults/general.conf b/assets/conf/defaults/general.conf -index 60372a4b4..f231f0c71 100644 ---- a/assets/conf/defaults/general.conf -+++ b/assets/conf/defaults/general.conf -@@ -15,7 +15,7 @@ - hide-ext-attribs="false" - canvas-corner-move="true" - invert-rangesel-trigger="false" -- check-update="true" -+ check-update="false" - check-versions="all" - save-last-position="true" - show-main-menu="false" diff --git a/assets/conf/general.conf b/assets/conf/general.conf index 60372a4b4..f231f0c71 100644 --- a/assets/conf/general.conf diff --git a/mingw-w64-pgmodeler/0003-pgmodeler-1.0.2-fix-global-attributes.patch b/mingw-w64-pgmodeler/0003-pgmodeler-1.0.2-fix-global-attributes.patch index ca524d83f2..0e038cb3a6 100644 --- a/mingw-w64-pgmodeler/0003-pgmodeler-1.0.2-fix-global-attributes.patch +++ b/mingw-w64-pgmodeler/0003-pgmodeler-1.0.2-fix-global-attributes.patch @@ -1,28 +1,28 @@ ---- pgmodeler-1.1.0.orig/libs/libutils/src/globalattributes.cpp 2024-02-23 17:25:50.495975900 +0300 -+++ pgmodeler-1.1.0/libs/libutils/src/globalattributes.cpp 2024-02-23 21:01:40.699745400 +0300 -@@ -66,7 +66,7 @@ - const QString GlobalAttributes::ObjMetadataExt(".omf"); - const QString GlobalAttributes::DirSeparator("/"); - const QString GlobalAttributes::ResourcesDir("res"); --const QString GlobalAttributes::ConfigurationsDir("conf"); -+const QString GlobalAttributes::ConfigurationsDir("../etc/pgmodeler"); - const QString GlobalAttributes::DefaultConfsDir("defaults"); - const QString GlobalAttributes::ConfsBackupsDir("backups"); - const QString GlobalAttributes::SchemasDir("schemas"); -@@ -75,9 +75,9 @@ - const QString GlobalAttributes::CatalogSchemasDir("catalog"); - const QString GlobalAttributes::DataDictSchemaDir("datadict"); - const QString GlobalAttributes::AlterSchemaDir("alter"); --const QString GlobalAttributes::LanguagesDir("lang"); --const QString GlobalAttributes::SamplesDir("samples"); --const QString GlobalAttributes::PluginsDir("plugins"); -+const QString GlobalAttributes::LanguagesDir("../share/pgmodeler/lang"); -+const QString GlobalAttributes::SamplesDir("../share/pgmodeler/samples"); -+const QString GlobalAttributes::PluginsDir("../lib/pgmodeler/plugins"); - const QString GlobalAttributes::SchemaExt(".sch"); - const QString GlobalAttributes::ObjectDTDDir("dtd"); - const QString GlobalAttributes::ObjectDTDExt(".dtd"); -@@ -322,7 +322,7 @@ +--- pgmodeler-1.2.0-alpha1.orig/libs/libutils/src/globalattributes.cpp 2024-10-25 23:08:01.552797000 +0300 ++++ pgmodeler-1.2.0-alpha1/libs/libutils/src/globalattributes.cpp 2024-10-25 23:09:19.480263700 +0300 +@@ -77,7 +77,7 @@ + const QString GlobalAttributes::ObjMetadataExt {".omf"}; + const QString GlobalAttributes::DirSeparator {"/"}; + const QString GlobalAttributes::ResourcesDir {"res"}; +-const QString GlobalAttributes::ConfigurationsDir {"conf"}; ++const QString GlobalAttributes::ConfigurationsDir {"../etc/pgmodeler"}; + const QString GlobalAttributes::DefaultConfsDir {"defaults"}; + const QString GlobalAttributes::ConfsBackupsDir {"backups"}; + const QString GlobalAttributes::SchemasDir {"schemas"}; +@@ -88,9 +88,9 @@ + const QString GlobalAttributes::DataDictHtmlDir {"html"}; + const QString GlobalAttributes::DataDictMdDir {"md"}; + const QString GlobalAttributes::AlterSchemaDir {"alter"}; +-const QString GlobalAttributes::LanguagesDir {"lang"}; +-const QString GlobalAttributes::SamplesDir {"samples"}; +-const QString GlobalAttributes::PluginsDir {"plugins"}; ++const QString GlobalAttributes::LanguagesDir {"../share/pgmodeler/lang"}; ++const QString GlobalAttributes::SamplesDir {"../share/pgmodeler/samples"}; ++const QString GlobalAttributes::PluginsDir {"../lib/pgmodeler/plugins"}; + const QString GlobalAttributes::SchemaExt {".sch"}; + const QString GlobalAttributes::ObjectDTDDir {"dtd"}; + const QString GlobalAttributes::ObjectDTDExt {".dtd"}; +@@ -326,7 +326,7 @@ setCustomPaths(search_path); setConfigFilesPaths(); diff --git a/mingw-w64-pgmodeler/PKGBUILD b/mingw-w64-pgmodeler/PKGBUILD index 9e37714d96..88fa86b5d5 100644 --- a/mingw-w64-pgmodeler/PKGBUILD +++ b/mingw-w64-pgmodeler/PKGBUILD @@ -4,8 +4,8 @@ _realname=pgmodeler pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-plugins") -pkgver=1.1.6 -_plugsha=26070ea470c7d569e6b94b1e28e6d330f91ab030 +pkgver=1.2.0 +_plugsha=a7baf113deec9888f22fc91ffca740562a02ae57 pkgrel=1 pkgdesc="PostgreSQL Database Modeler: an open source CASE tool for modeling PostgreSQL databases (mingw-w64)" url="https://pgmodeler.io" @@ -25,11 +25,11 @@ source=("${msys2_repository_url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.g '0001-pgmodeler-1.0.2-libgui-inc.patch' '0002-pgmodeler-1.0.2-no-check-update.patch' '0003-pgmodeler-1.0.2-fix-global-attributes.patch') -sha256sums=('4ffe1bb7ab96bf66b3188d0bd3bf378b5c4b670659739928a6c68482bf9fff6f' - '1ee0907975f35c5ee95cda4a549356c33e60d3d26b153cd2287992d8dd68d67f' +sha256sums=('66d1cc441a5247edb3fe9b5f09fbc480023955da037cd09a5c8811d3caa7f270' + 'c5bfe5e14a22f9004993d61f16bee423dce7564c609f47f174dfa2cedaec9c8f' 'f658ed0129b0402c8d91b44f62498e35f9c1af87ae14ae1a4030f0b9e7b8bf78' - 'ceae3c5dadf80754ffdea133a53a1bd28bca9e837af0c495d52f5651c8e89fef' - '4a1d58a746fab7ac852014abae85ecf8312b5f52d9282c766290e63637b1447a') + '38747cc62c068e1597a10661ceb750e7545ffcd9125ba9b237f663374e4b8a2b' + 'd902b82a0a397380c7b61327dd67fd6d6f2c50351d2b1fa480bc80b1ab47546d') prepare() { cd "${srcdir}"/${_realname}-${pkgver}