summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--0001-add-missing-include.patch23
-rw-r--r--PKGBUILD45
-rw-r--r--qtcbm.desktop9
4 files changed, 58 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a2b1a4807d99..c9b709c30508 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,16 @@
pkgbase = qtcbm
pkgdesc = Qt GUI Frontend for the (Open)CBM utils
- pkgver = 1.0.0
- pkgrel = 2
+ pkgver = 1.1.0
+ pkgrel = 0
url = https://github.com/mveinot/QtCBM
arch = i686
arch = x86_64
license = GPLv2
depends = qt5-base
depends = opencbm-git
- source = https://github.com/mveinot/QtCBM/archive/v1.0.0.tar.gz
- source = git+https://git.gitorious.org/qt-solutions/qt-solutions.git
- md5sums = d53f8b0c09059604ed698ac6c11ed061
+ source = git+https://github.com/mveinot/QtCBM.git
+ source = git+https://github.com/qtproject/qt-solutions.git
+ md5sums = SKIP
md5sums = SKIP
- sha1sums = ff8f24fdf1b2316f65433766c72de58520512d06
- sha1sums = SKIP
- sha256sums = dbeb32a8c51c84c434918a9c31729ea37be2a7b9788d1417bac5cf8d88a49d2a
- sha256sums = SKIP
- sha384sums = eed22d0d693304d867fcaf5df3cf242e15bb17bd45889fe1ed063df22e8f95ffbd91d59ce44965d63900c6efc0a98eb7
- sha384sums = SKIP
- sha512sums = ee9c057e4f00916a0e2a450c4e4f50177ce76d54dd546786dd59903aa65883013bc811d82290e79e492da9c3c0b34b3eb83b8c377bba8255d53757c58b35e004
- sha512sums = SKIP
pkgname = qtcbm
-
diff --git a/0001-add-missing-include.patch b/0001-add-missing-include.patch
new file mode 100644
index 000000000000..32d1f2328aa1
--- /dev/null
+++ b/0001-add-missing-include.patch
@@ -0,0 +1,23 @@
+From f3491af99a97674510b9d0b908e3c537b6bf77a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jochen=20J=C3=A4gers?= <jochen.jaegers@gmail.com>
+Date: Thu, 16 Mar 2023 18:46:05 +0100
+Subject: [PATCH] add missing include
+
+---
+ detailsinfodialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/detailsinfodialog.cpp b/detailsinfodialog.cpp
+index 33c5177..448e358 100644
+--- a/detailsinfodialog.cpp
++++ b/detailsinfodialog.cpp
+@@ -1,5 +1,6 @@
+ #include "detailsinfodialog.h"
+ #include "ui_detailsinfodialog.h"
++#include <QStyle>
+
+ detailsInfoDialog::detailsInfoDialog(QWidget *parent) :
+ QDialog(parent),
+--
+2.40.0
+
diff --git a/PKGBUILD b/PKGBUILD
index c13efaf36453..f82d0d14d33c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
# PKGBUILD for qtcbm
#
# Contributor: Uffe Jakobsen <microtop@starion.dk>
-# Maintainer: Uffe Jakobsen <microtop@starion.dk>
+# Contributor: Jochen Jägers <jochen.jaegers@gmail.com>
+# Maintainer: Jochen Jägers <jochen.jaegers@gmail.com>
#
pkgname=qtcbm
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.1.0
+pkgrel=0
epoch=
pkgdesc="Qt GUI Frontend for the (Open)CBM utils"
arch=('i686' 'x86_64')
_pkgname=QtCBM
-_pkgver=1.0.0
+_pkgver=1.1.0
url="https://github.com/mveinot/QtCBM"
license=('GPLv2')
groups=()
-#depends=('qt5-base' 'qt-solutions' 'opencbm-git')
depends=('qt5-base' 'opencbm-git')
makedepends=()
checkdepends=()
@@ -27,43 +27,40 @@ backup=()
options=()
install=
changelog=
-source=("https://github.com/mveinot/${_pkgname}/archive/v${_pkgver}.tar.gz"
- "git+https://git.gitorious.org/qt-solutions/qt-solutions.git")
+source=("git+https://github.com/mveinot/QtCBM.git"
+ "git+https://github.com/qtproject/qt-solutions.git")
noextract=()
-sha512sums=('ee9c057e4f00916a0e2a450c4e4f50177ce76d54dd546786dd59903aa65883013bc811d82290e79e492da9c3c0b34b3eb83b8c377bba8255d53757c58b35e004'
- 'SKIP')
-md5sums=('d53f8b0c09059604ed698ac6c11ed061'
+
+md5sums=('SKIP'
'SKIP')
-sha1sums=('ff8f24fdf1b2316f65433766c72de58520512d06'
- 'SKIP')
-sha256sums=('dbeb32a8c51c84c434918a9c31729ea37be2a7b9788d1417bac5cf8d88a49d2a'
- 'SKIP')
-sha384sums=('eed22d0d693304d867fcaf5df3cf242e15bb17bd45889fe1ed063df22e8f95ffbd91d59ce44965d63900c6efc0a98eb7'
- 'SKIP')
-sha512sums=('ee9c057e4f00916a0e2a450c4e4f50177ce76d54dd546786dd59903aa65883013bc811d82290e79e492da9c3c0b34b3eb83b8c377bba8255d53757c58b35e004'
- 'SKIP')
prepare() {
- cd "$srcdir/${_pkgname}-${_pkgver}"
+ cd "$srcdir/${_pkgname}"
+ patch -p1 < ../../0001-add-missing-include.patch
}
build() {
- cd "${srcdir}/${_pkgname}-${_pkgver}"
- #make -C diskimage -f Makefile.unix
+ cd "${srcdir}/${_pkgname}"
+ make -C diskimage -f Makefile.unix
qmake
make
+
+ # convert ico to png
+ convert QtCBM.ico qtcbm.png
}
check() {
- cd "${srcdir}/${_pkgname}-${_pkgver}"
+ cd "${srcdir}/${_pkgname}"
make -k check
}
package() {
- cd "${srcdir}/${_pkgname}-${_pkgver}"
+ cd "${srcdir}/${_pkgname}"
make DESTDIR="${pkgdir}/" install
- install -Dm0755 ${_pkgname} "$pkgdir/usr/local/bin/qtcbm"
+ install -Dm0755 ${_pkgname} "$pkgdir/usr/bin/qtcbm"
+ install -Dm0755 qtcbm-1.png "$pkgdir/usr/share/pixmaps/qtcbm.png"
+ install -Dm0755 ../../qtcbm.desktop "$pkgdir/usr/share/applications/qtcbm.desktop"
}
# EOF
diff --git a/qtcbm.desktop b/qtcbm.desktop
new file mode 100644
index 000000000000..14770fc9fcae
--- /dev/null
+++ b/qtcbm.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Version=1.0.0
+Name=QtCBM
+Comment=GUI Frontend for the CBM utils
+Path=/usr/bin/
+Exec=qtcbm
+Icon=qtcbm.png
+Terminal=false \ No newline at end of file