Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pgmodeler: update to 1.2.0-alpha1 #22306

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

pgmodeler: update to 1.2.0-alpha1 #22306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions mingw-w64-pgmodeler/0002-pgmodeler-1.0.2-no-check-update.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
50 changes: 25 additions & 25 deletions mingw-w64-pgmodeler/0003-pgmodeler-1.0.2-fix-global-attributes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();

Expand Down
19 changes: 10 additions & 9 deletions mingw-w64-pgmodeler/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ _realname=pgmodeler
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-plugins")
pkgver=1.1.4
_pkgver=1.2.0-alpha1
pkgver=${_pkgver::5}
_plugsha=26070ea470c7d569e6b94b1e28e6d330f91ab030
pkgrel=1
pkgdesc="PostgreSQL Database Modeler: an open source CASE tool for modeling PostgreSQL databases (mingw-w64)"
Expand All @@ -20,33 +21,33 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-${_realname}-plugins: official plugins")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-qt6-tools")

source=("${msys2_repository_url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
source=("${msys2_repository_url}/archive/v${_pkgver}/${_realname}-${_pkgver}.tar.gz"
"https://github.com/pgmodeler/plugins/archive/${_plugsha}/plugins-${_plugsha}.tar.gz"
'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=('87659429702d5a02e8c873e4a832da3a970e871eeadc1cb95d5835f6a1851e15'
sha256sums=('a49a89ccac051c45a7ef12d836399a86169c7facecf3fc97a3e7e5280bb8cfb3'
'1ee0907975f35c5ee95cda4a549356c33e60d3d26b153cd2287992d8dd68d67f'
'f658ed0129b0402c8d91b44f62498e35f9c1af87ae14ae1a4030f0b9e7b8bf78'
'ceae3c5dadf80754ffdea133a53a1bd28bca9e837af0c495d52f5651c8e89fef'
'4a1d58a746fab7ac852014abae85ecf8312b5f52d9282c766290e63637b1447a')
'38747cc62c068e1597a10661ceb750e7545ffcd9125ba9b237f663374e4b8a2b'
'd902b82a0a397380c7b61327dd67fd6d6f2c50351d2b1fa480bc80b1ab47546d')

prepare() {
cd ${srcdir}/${_realname}-${pkgver}
cd ${srcdir}/${_realname}-${_pkgver}

patch -Np1 -i "${srcdir}"/0001-pgmodeler-1.0.2-libgui-inc.patch
patch -Np1 -i "${srcdir}"/0002-pgmodeler-1.0.2-no-check-update.patch
patch -Np1 -i "${srcdir}"/0003-pgmodeler-1.0.2-fix-global-attributes.patch

cp -r ${srcdir}/plugins-${_plugsha} ${srcdir}/${_realname}-${pkgver}/plugins
cp -r ${srcdir}/plugins-${_plugsha} ${srcdir}/${_realname}-${_pkgver}/plugins
}

build() {
msg2 "Will be in future"
}

package_pgmodeler() {
cd ${srcdir}/${_realname}-${pkgver}
cd ${srcdir}/${_realname}-${_pkgver}

"${MINGW_PREFIX}"/bin/qmake6.exe CONFIG+=release \
PREFIX="${pkgdir}${MINGW_PREFIX}" \
Expand Down Expand Up @@ -83,7 +84,7 @@ package_pgmodeler() {
}

package_pgmodeler-plugins() {
cd ${srcdir}/${_realname}-${pkgver}
cd ${srcdir}/${_realname}-${_pkgver}

pkgdesc+=" (plugins)"
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}")
Expand Down