summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--[-rwxr-xr-x]PKGBUILD93
-rw-r--r--mimetype.xml11
-rwxr-xr-xpgmodeler6
-rwxr-xr-xpgmodeler-cli5
-rwxr-xr-xpgmodeler.desktop24
6 files changed, 71 insertions, 88 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 80a75dd37575..d2616abc8d2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,25 @@
pkgbase = pgmodeler
pkgdesc = PostgreSQL Database Modeler: an open source CASE tool for modeling PostgreSQL databases
pkgver = 0.9.2_beta
- pkgrel = 1
+ pkgrel = 2
epoch = 2
- url = https://pgmodeler.io/
- install = pgmodeler.install
- arch = i686
+ url = https://pgmodeler.io
arch = x86_64
license = GPL3
- makedepends = qt5-tools
- depends = qt5-base
depends = qt5-svg
- depends = libxml2
- depends = libsm
depends = libpqxx
- optdepends = postgresql
+ options = emptydirs
source = https://github.com/pgmodeler/pgmodeler/archive/v0.9.2-beta.tar.gz
- source = pgmodeler
- source = pgmodeler-cli
source = pgmodeler_logo.png
source = pgmodeler_dbm.png
source = pgmodeler.desktop
+ source = mimetype.xml
source = patch_no_check_update.diff
sha1sums = 3355bebc838984e2700289459416edd8d0c5c5b8
- sha1sums = dcdc83e561355b5e456d693d7fe52c4e68ffae2a
- sha1sums = 8d5edba1b839a61afdc78c4b10df2b92158f4215
sha1sums = c5bb090a1cbb784cd2ec9e1449cac02af2ba6538
sha1sums = 4c4e4260f4b2d2d4c154a8fb5cd7060a6585c83a
- sha1sums = b19e826b6fb64429df952780b8519100c65b8383
+ sha1sums = 92b7b52f601de1b2b6cfd4a3fde87746befc95b0
+ sha1sums = f2ccb85a5c3500212c710ec538c9fae96356af21
sha1sums = 448e756999f5770680eb039f590dd61eb6225b34
pkgname = pgmodeler
diff --git a/PKGBUILD b/PKGBUILD
index 4e9a2196731b..c8d50a8fa5df 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,86 +1,65 @@
# Maintainer: Marc Cousin (cousinmarc at gmail dot com)
+# Contributor: Severin Glöckner (severin.gloeckner@stud.htwk-leipzig.de)
pkgname=pgmodeler
pkgver=0.9.2_beta
-pkgrel=1
+pkgrel=2
epoch=2
pkgdesc="PostgreSQL Database Modeler: an open source CASE tool for modeling PostgreSQL databases"
-
-url="https://pgmodeler.io/"
+url="https://pgmodeler.io"
license=('GPL3')
-
-arch=('i686' 'x86_64')
-
-depends=('qt5-base' 'qt5-svg' 'libxml2' 'libsm' 'libpqxx')
-makedepends=('qt5-tools')
-optdepends=('postgresql')
+arch=('x86_64')
+depends=('qt5-svg' 'libpqxx')
source=("https://github.com/$pkgname/$pkgname/archive/v${pkgver//_/-}.tar.gz"
- 'pgmodeler'
- 'pgmodeler-cli'
'pgmodeler_logo.png'
'pgmodeler_dbm.png'
'pgmodeler.desktop'
- 'patch_no_check_update.diff')
+ 'mimetype.xml'
+ 'patch_no_check_update.diff')
sha1sums=('3355bebc838984e2700289459416edd8d0c5c5b8'
- 'dcdc83e561355b5e456d693d7fe52c4e68ffae2a'
- '8d5edba1b839a61afdc78c4b10df2b92158f4215'
'c5bb090a1cbb784cd2ec9e1449cac02af2ba6538'
'4c4e4260f4b2d2d4c154a8fb5cd7060a6585c83a'
- 'b19e826b6fb64429df952780b8519100c65b8383'
+ '92b7b52f601de1b2b6cfd4a3fde87746befc95b0'
+ 'f2ccb85a5c3500212c710ec538c9fae96356af21'
'448e756999f5770680eb039f590dd61eb6225b34')
-install='pgmodeler.install'
+options=('emptydirs')
build() {
- cd "$srcdir/$pkgname-${pkgver//_/-}"
- patch -p1 < ../patch_no_check_update.diff
-
- # release is needed to get the full dummy and xml2object plugins
- #qmake CONFIG+=release pgmodeler.pro
- qmake pgmodeler.pro
- make || true
- # Temporary ugly fix for https://bugreports.qt.io/browse/QTBUG-65251
- cd libpgmodeler_ui/src
- for i in *.h
- do
- sed -i 's/setShortcut(QLatin1String/setShortcut(QKeySequence/' $i
- done
- cd -
- make
+ cd "$srcdir/$pkgname-${pkgver//_/-}"
+ patch -p1 < ../patch_no_check_update.diff
+ # release is needed to get the full dummy and xml2object plugins (doesn't seem to work)
+ qmake CONFIG+=release \
+ PREFIX=/usr \
+ CONFDIR=/etc/pgmodeler \
+ PRIVATEBINDIR=/usr/bin \
+ DOCDIR=/usr/share/doc/pgmodeler \
+ SAMPLESDIR=/usr/share/doc/pgmodeler \
+ NO_UPDATE_CHECK=AURdoesthis \
+ QMAKE_CXXFLAGS_RELEASE+="${CXXFLAGS} ${CPPFLAGS}" \
+ pgmodeler.pro
+ make
}
package() {
- cd "$srcdir/$pkgname-${pkgver//_/-}"
- make INSTALL_ROOT="${pkgdir}" install
- buildir="$srcdir/$pkgname-${pkgver//_/-}"
+ cd "$srcdir/$pkgname-${pkgver//_/-}"
- msg2 "Creating required dirs"
- mkdir -p "$pkgdir"/{etc/$pkgname,usr/{bin,share/{applications,icons/hicolor/64x64/{apps,mimetypes},licenses/$pkgname,$pkgname}}}
+ make INSTALL_ROOT="${pkgdir}" install
- msg2 "Moving stuff in place"
- # To be removed after 0.9-beta
- find $buildir -name connections.conf -exec sed -i 's/connect-timeout/connection-timeout/g' {} \;
- cp -R "$buildir"/conf/*.conf "$pkgdir/etc/$pkgname/"
- cp -R "$buildir"/conf/{schemas,defaults,dtd,example.dbm} "$pkgdir/usr/share/$pkgname/"
-# cp -R "$buildir"/* "$pkgdir/opt/$pkgname/" # What was this for ? we copy everything ?
+ install -Dm644 "$pkgname.appdata.xml" "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml"
+ install -Dm644 "$srcdir/pgmodeler_logo.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/pgmodeler.png"
+ install -Dm644 "$srcdir/pgmodeler_dbm.png" "$pkgdir/usr/share/icons/hicolor/64x64/mimetypes/pgmodeler-dbm.png"
+ install -Dm644 "$srcdir/pgmodeler.desktop" "$pkgdir/usr/share/applications/pgmodeler.desktop"
+ install -Dm644 "$srcdir/mimetype.xml" "$pkgdir/usr/share/mime/packages/pgmodeler.xml"
- local fmp=''
- for fmp in schemas dtd;
- do
- ln -s "/usr/share/$pkgname/$fmp" "$pkgdir/etc/$pkgname/$fmp"
- done
- ln -s "/usr/share/$pkgname/example.dbm" "$pkgdir/etc/$pkgname/example.dbm"
+ # Needs to be there, but belongs rather to doc
+ ln -s "/etc/$pkgname/example.dbm" "$pkgdir/usr/share/doc/$pkgname/example.dbm"
- install -m755 "$srcdir/pgmodeler" "$pkgdir/usr/bin"
- install -m755 "$srcdir/pgmodeler-cli" "$pkgdir/usr/bin"
- install -m644 "$srcdir/pgmodeler_logo.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/pgmodeler.png"
- #install -m644 "$srcdir/pgmodeler_dbm.png" "$pkgdir/usr/share/icons/hicolor/64x64/mimetypes/TODO_REGISTER_MIME_ICON.png"
- install -m644 "$srcdir/pgmodeler.desktop" "$pkgdir/usr/share/applications"
- # Create an empty plugin directory to get rid of error during startup
- mkdir -p "$pkgdir/usr/local/lib/pgmodeler/plugins/"
+ # Create an empty plugin directory to get rid of error when opening plugin directory
+ mkdir "$pkgdir/usr/lib/pgmodeler/plugins/"
-# msg2 "Removing redundant files"
-# rm -rf "$pkgdir/opt/$pkgname/"{conf,LICENSE,pgmodeler.vars}
+ # License file not needed for GPL, readme is for github
+ rm "$pkgdir/usr/share/doc/$pkgname/"{LICENSE,README.md}
}
diff --git a/mimetype.xml b/mimetype.xml
new file mode 100644
index 000000000000..68e390fcaa1f
--- /dev/null
+++ b/mimetype.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-dbm">
+ <sub-class-of type="application/xml"/>
+ <comment>pgModeler database model</comment>
+ <comment xml:lang="de">pgModeler Datenbankmodell</comment>
+ <icon name="pgmodeler-dbm"/>
+ <glob pattern="*.dbm"/>
+ </mime-type>
+</mime-info>
+
diff --git a/pgmodeler b/pgmodeler
deleted file mode 100755
index 93535d55e151..000000000000
--- a/pgmodeler
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-[ ! -d $HOME/.pgmodeler ] && cp -r /etc/pgmodeler $HOME/.pgmodeler
-
-
-/usr/local/bin/pgmodeler
diff --git a/pgmodeler-cli b/pgmodeler-cli
deleted file mode 100755
index 52c50f7a41f9..000000000000
--- a/pgmodeler-cli
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-[ ! -d $HOME/.pgmodeler ] && cp -r /etc/pgmodeler $HOME/.pgmodeler
-
-/usr/local/bin/pgmodeler-cli
diff --git a/pgmodeler.desktop b/pgmodeler.desktop
index a59d05e80cb0..1faab0f4be83 100755
--- a/pgmodeler.desktop
+++ b/pgmodeler.desktop
@@ -1,10 +1,22 @@
[Desktop Entry]
-Encoding=UTF-8
+Version=1.0
+Type=Application
Name=pgModeler
-Exec=pgmodeler
-Comment=PostgreSQL Database Modeler a CASE tool for modeling PostgreSQL databases.
-Icon=pgmodeler
+GenericName=Database Modeling Tool
+GenericName[en_AU]=Database Modelling Tool
+GenericName[en_GB]=Database Modelling Tool
+GenericName[en_NZ]=Database Modelling Tool
+GenericName[en_ZA]=Database Modelling Tool
+GenericName[en]=Datenbank Modellierungs Tool
+Comment=A CASE tool for modeling PostgreSQL databases
+Comment[en_AU]=A CASE tool for modelling PostgreSQL databases
+Comment[en_GB]=A CASE tool for modelling PostgreSQL databases
+Comment[en_NZ]=A CASE tool for modelling PostgreSQL databases
+Comment[en_ZA]=A CASE tool for modelling PostgreSQL databases
+Comment[de]=Hilfsmittel, um Modelle für PostgrSQL-Datenbanken zu entwerfen
StartupNotify=true
Terminal=false
-Type=Application
-Categories=Application;Development;
+Icon=pgmodeler
+Exec=pgmodeler
+Categories=Development;Database;
+MimeType=application/x-dbm;