Browse Source

bump version to v1.9
update PKGBUILD and Dockerfile

Sonnix 4 years ago
parent
commit
77ce918e8c
4 changed files with 21 additions and 9 deletions
  1. 18 6
      Dockerfile
  2. 1 1
      PKGBUILD
  3. 1 1
      Qqsp.pro
  4. 1 1
      main.cpp

+ 18 - 6
Dockerfile

@@ -1,10 +1,22 @@
-FROM base/archlinux
+FROM archlinux/base as builder
 
-COPY qqsp-1.8-1-x86_64.pkg.tar.xz /tmp/
 RUN pacman -Sy --noconfirm archlinux-keyring
 RUN pacman -Syu --noconfirm
-RUN pacman -S --noconfirm xorg-server-xvfb xorg-fonts-misc ttf-bitstream-vera 
-RUN pacman --noconfirm -U /tmp/qqsp-1.8-1-x86_64.pkg.tar.xz
-RUN rm /tmp/qqsp-1.8-1-x86_64.pkg.tar.xz
+RUN pacman -S --noconfirm xorg-server-xvfb xorg-fonts-misc ttf-bitstream-vera base-devel git x11-ssh-askpass
+COPY PKGBUILD /tmp/build/
+RUN chmod 777 /tmp/build
+RUN echo "nobody ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+WORKDIR /tmp/build
+RUN su nobody -s /bin/bash -c "makepkg -s --noconfirm"
+
+FROM archlinux/base
+
+COPY --from=builder /tmp/build/qqsp-1.9-1-x86_64.pkg.tar.xz /tmp/
+RUN pacman -Sy --noconfirm archlinux-keyring
+RUN pacman -Syu --noconfirm
+RUN pacman -S --noconfirm xorg-server-xvfb xorg-fonts-misc ttf-bitstream-vera
+RUN pacman --noconfirm -U /tmp/qqsp-1.9-1-x86_64.pkg.tar.xz
+RUN rm /tmp/qqsp-1.9-1-x86_64.pkg.tar.xz
 ENV QTWEBENGINE_DISABLE_SANDBOX=1
-CMD ["/usr/bin/Qqsp"]
+ENTRYPOINT ["/usr/bin/Qqsp"]
+CMD []

+ 1 - 1
PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=qqsp
 _pkgname=Qqsp
-pkgver=1.8
+pkgver=1.9
 pkgrel=1
 pkgdesc="Qt Quest Soft Player"
 arch=(i686 x86_64)

+ 1 - 1
Qqsp.pro

@@ -240,7 +240,7 @@ win32|macx {
     QMAKE_POST_LINK = $${DEPLOY_COMMAND} $${DEPLOY_TARGET}
 }
 
-VERSION = 1.8.0.0
+VERSION = 1.9.0.0
 
 win32:RC_ICONS += icons/logo.ico
 

+ 1 - 1
main.cpp

@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setApplicationName("Qqsp");
     a.setOrganizationName("Qqsp");
-    a.setApplicationVersion("1.8");
+    a.setApplicationVersion("1.9");
     a.setDoubleClickInterval(1);
 
     QObject::tr("__LANGNAME__");