[arch-commits] Commit in dvdstyler/trunk (PKGBUILD config.patch)

[Antonio Rojas]

    Date: Thursday, July 7, 2022 @ 21:01:20
  Author: arojas
Revision: 1248296

Update to 3.2.1

Modified:
  dvdstyler/trunk/PKGBUILD
Deleted:
  dvdstyler/trunk/config.patch

--------------+
 PKGBUILD     |   11 ++++-------
 config.patch |   42 ------------------------------------------
 2 files changed, 4 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-07 20:55:49 UTC (rev 1248295)
+++ PKGBUILD	2022-07-07 21:01:20 UTC (rev 1248296)
@@ -6,8 +6,8 @@
 # Contributor: Mario J Steele <mario at ruby-im.net>
 
 pkgname=dvdstyler
-pkgver=3.1.2
-pkgrel=5
+pkgver=3.2.1
+pkgrel=1
 pkgdesc='DVD authoring application for the creation of professional-looking DVDs'
 arch=('x86_64')
 url='https://www.dvdstyler.org/'
@@ -15,15 +15,12 @@
 depends=('cdrtools' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg4.4' 'wxsvg')
 makedepends=('docbook-xsl' 'xmlto' 'zip' 'ffmpeg')
 source=("https://downloads.sourceforge.net/$pkgname/DVDStyler-$pkgver.tar.bz2"
-        'config.patch'
         'dvdstyler.appdata.xml')
-sha256sums=('04ff61c278167363904f7ee366bcf98ee15ce05368fa353f6d8ab1e8305d9a0e'
-            'ebcadbea33d96c955bd3811d7bb269fcb4006b8525dfafcf291e5779debba913'
+sha256sums=('0bb3348739f4c93097454b814ecb3a58f6bace8f030f41619a9feeafb4747558'
             '7c0abb349664e9a179e68feb2c614c4f9f5480b7fcd74040d043864b80cecd4a')
 
 prepare() {
   cd DVDStyler-$pkgver
-  patch -RNp1 -i ../config.patch
   sed -i 's|/pixmaps|/icons/hicolor/48x48/apps|' data/Makefile.{am,in}
 }
 
@@ -30,7 +27,7 @@
 build() {
   cd DVDStyler-$pkgver
   export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
-  ./configure --prefix=/usr --with-wx-config=/usr/bin/wx-config-gtk3
+  ./configure --prefix=/usr
   make
 }
 

Deleted: config.patch
===================================================================
--- config.patch	2022-07-07 20:55:49 UTC (rev 1248295)
+++ config.patch	2022-07-07 21:01:20 UTC (rev 1248296)
@@ -1,42 +0,0 @@
-From 30937f6e427153e85862afed41e69b470d52dc67 Mon Sep 17 00:00:00 2001
-From: ntalex <alex at thuering.biz>
-Date: Fri, 2 Aug 2019 22:49:37 +0200
-Subject: changed to use configation file .dvdstyler/dvdstyler under unix
-
-
-diff --git a/src/Config.cpp b/src/Config.cpp
-index a1ccbf5..6ea06fc 100644
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -10,9 +10,8 @@
- 
- #include "Config.h"
- #include <wxVillaLib/utils.h>
--#ifdef __WXMSW__
- #include <wx/fileconf.h>
--#endif
-+#include <wx/stdpaths.h>
- 
- Config s_config;
- 
-@@ -27,8 +26,19 @@ void Config::Init() {
- 		} else
- 			wxConfig::Set(new wxFileConfig(wxT(""), wxT(""), fileName));
- 	}
--#endif
-+#elif defined(__WXMAC__)
- 	cfg = wxConfig::Get();
-+#else
-+	// check if .dvdstyler exist and move it
-+	wxString dataDir = wxStandardPaths::Get().GetUserLocalDataDir();
-+	if (wxFileExists(dataDir)) {
-+		wxRenameFile(dataDir, dataDir + ".tmp");
-+		wxMkdir(dataDir);
-+		wxRenameFile(dataDir + ".tmp", dataDir + wxFILE_SEP_PATH + "dvdstyler");
-+	}
-+	cfg = new wxFileConfig("", "", dataDir + wxFILE_SEP_PATH + "dvdstyler");
-+	wxConfig::Set(cfg);
-+#endif
- }
- 
- bool Config::IsMainWinMaximized() {