[arch-commits] Commit in canorus/trunk (PKGBUILD)

2020-11-12 Thread Evangelos Foutras via arch-commits 
Date: Thursday, November 12, 2020 @ 17:06:59
  Author: foutrelis
Revision: 752255

upgpkg: canorus 0.7.3rc3-4: Python 3.9 rebuild

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 17:06:55 UTC (rev 752254)
+++ PKGBUILD2020-11-12 17:06:59 UTC (rev 752255)
@@ -5,7 +5,7 @@
 
 pkgname=canorus
 pkgver=0.7.3rc3
-pkgrel=3
+pkgrel=4
 pkgdesc="A free music score editor"
 arch=('x86_64')
 url="http://www.canorus.org/;

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2019-11-03 Thread Felix Yan via arch-commits 
Date: Monday, November 4, 2019 @ 05:31:48
  Author: felixonmars
Revision: 523200

Python 3.8 rebuild

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 05:31:35 UTC (rev 523199)
+++ PKGBUILD2019-11-04 05:31:48 UTC (rev 523200)
@@ -5,7 +5,7 @@
 
 pkgname=canorus
 pkgver=0.7.3rc3
-pkgrel=2
+pkgrel=3
 pkgdesc="A free music score editor"
 arch=('x86_64')
 url="http://www.canorus.org/;

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2018-12-15 Thread Maxim Baz via arch-commits 
Date: Saturday, December 15, 2018 @ 20:33:34
  Author: maximbaz
Revision: 416389

canorus: use https sources

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-15 20:32:45 UTC (rev 416388)
+++ PKGBUILD2018-12-15 20:33:34 UTC (rev 416389)
@@ -12,7 +12,7 @@
 license=('GPL')
 depends=('qt5-svg' 'qt5-webengine' 'alsa-lib' 'zlib' 'python')
 makedepends=('cmake' 'swig' 'qt5-tools' 'ruby')
-source=("http://downloads.sourceforge.net/project/canorus/0.7.3/canorus-${pkgver}.tar.bz2;)
+source=("https://downloads.sourceforge.net/project/canorus/0.7.3/canorus-${pkgver}.tar.bz2;)
 sha256sums=('c5d470ac6cae696472dcb7176e0cd4545b883ff84ae2dc767a8956546f5b4b15')
 
 build() {

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2018-09-04 Thread Evgeniy Alekseev via arch-commits 
Date: Tuesday, September 4, 2018 @ 11:52:28
  Author: arcanis
Revision: 376615

upgpkg: canorus 0.7.3rc3-2

allow deprecated calls instead of patching (see FS#59760)

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-04 11:28:48 UTC (rev 376614)
+++ PKGBUILD2018-09-04 11:52:28 UTC (rev 376615)
@@ -6,7 +6,7 @@
 
 pkgname=canorus
 pkgver=0.7.3rc3
-pkgrel=1
+pkgrel=2
 pkgdesc="A free music score editor"
 arch=('x86_64')
 url="http://www.canorus.org/;
@@ -13,20 +13,14 @@
 license=('GPL')
 depends=('qt5-svg' 'qt5-webengine' 'alsa-lib' 'zlib' 'python')
 makedepends=('cmake' 'swig' 'qt5-tools' 'ruby')
-source=("http://downloads.sourceforge.net/project/canorus/0.7.3/canorus-${pkgver}.tar.bz2;
-"python-3.7.patch")
-sha256sums=('c5d470ac6cae696472dcb7176e0cd4545b883ff84ae2dc767a8956546f5b4b15'
-'5474199c0f02e4ec1ea6062b2aa9fb48cdeab9ba4c895f236918aed43a18c070')
+source=("http://downloads.sourceforge.net/project/canorus/0.7.3/canorus-${pkgver}.tar.bz2;)
+sha256sums=('c5d470ac6cae696472dcb7176e0cd4545b883ff84ae2dc767a8956546f5b4b15')
 
-prepare() {
-  patch -p0 -i "${srcdir}/python-3.7.patch"
-}
-
 build() {
   cd $pkgname-$pkgver
   # stringop-truncation will be fixes in swig, see 
https://github.com/swig/swig/issues/893
-  export CXXFLAGS+=" -Wno-misleading-indentation -Wno-dangling-else 
-Wno-stringop-truncation"
-  cmake . -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr \
+  export CXXFLAGS+=" -Wno-misleading-indentation -Wno-dangling-else 
-Wno-stringop-truncation -Wno-deprecated -Wno-deprecated-declarations"
+  cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr \
-DDEFAULT_DATA_DIR="/usr/share/canorus"
 }

[arch-commits] Commit in canorus/trunk (PKGBUILD python-3.7.patch)

2018-07-25 Thread Evgeniy Alekseev via arch-commits 
Date: Wednesday, July 25, 2018 @ 12:33:56
  Author: arcanis
Revision: 363378

upgpkg: canorus 0.7.3rc3-1

python-3.7 rebuild fixes

Added:
  canorus/trunk/python-3.7.patch
Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |   15 --
 python-3.7.patch |  126 +
 2 files changed, 137 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-25 11:27:08 UTC (rev 363377)
+++ PKGBUILD2018-07-25 12:33:56 UTC (rev 363378)
@@ -5,7 +5,7 @@
 # Contributor: hm_b 
 
 pkgname=canorus
-pkgver=0.7.3rc1
+pkgver=0.7.3rc3
 pkgrel=1
 pkgdesc="A free music score editor"
 arch=('x86_64')
@@ -13,12 +13,19 @@
 license=('GPL')
 depends=('qt5-svg' 'qt5-webengine' 'alsa-lib' 'zlib' 'python')
 makedepends=('cmake' 'swig' 'qt5-tools' 'ruby')
-source=("http://downloads.sourceforge.net/project/canorus/0.7.3/canorus-${pkgver}.tar.bz2;)
-sha256sums=('e363f3cdb382a78d22c0c41541ed087197ddb3df1b981ec80072ec52f9c4')
+source=("http://downloads.sourceforge.net/project/canorus/0.7.3/canorus-${pkgver}.tar.bz2;
+"python-3.7.patch")
+sha256sums=('c5d470ac6cae696472dcb7176e0cd4545b883ff84ae2dc767a8956546f5b4b15'
+'5474199c0f02e4ec1ea6062b2aa9fb48cdeab9ba4c895f236918aed43a18c070')
 
+prepare() {
+  patch -p0 -i "${srcdir}/python-3.7.patch"
+}
+
 build() {
   cd $pkgname-$pkgver
-  export CXXFLAGS+=" -Wno-misleading-indentation -Wno-dangling-else"
+  # stringop-truncation will be fixes in swig, see 
https://github.com/swig/swig/issues/893
+  export CXXFLAGS+=" -Wno-misleading-indentation -Wno-dangling-else 
-Wno-stringop-truncation"
   cmake . -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr \
-DDEFAULT_DATA_DIR="/usr/share/canorus"
 }

Added: python-3.7.patch
===
--- python-3.7.patch(rev 0)
+++ python-3.7.patch2018-07-25 12:33:56 UTC (rev 363378)
@@ -0,0 +1,126 @@
+diff -ruN canorus-0.7.3rc3-orig/src/scripting/swigpython.cpp 
canorus-0.7.3rc3/src/scripting/swigpython.cpp
+--- canorus-0.7.3rc3-orig/src/scripting/swigpython.cpp 2018-07-25 
14:59:07.105433821 +0300
 canorus-0.7.3rc3/src/scripting/swigpython.cpp  2018-07-25 
15:01:53.615606426 +0300
+@@ -81,13 +81,14 @@
+ PyEval_ReleaseLock();
+ 
+// my section with thread initialization
+-PyEval_AcquireLock();
++PyThreadState *state = nullptr;
++PyEval_AcquireThread(state);
+ PyInterpreterState * mainInterpreterState = mainThreadState->interp;
+ 
+ pycliThreadState = PyThreadState_New(mainInterpreterState);
+ PyThreadState_Swap(mainThreadState);
+ 
+-PyEval_ReleaseLock();
++PyEval_ReleaseThread(state);
+ }
+ 
+ /*!
+@@ -136,7 +137,8 @@
+   QString moduleName = fileName.left(fileName.lastIndexOf(".py"));
+   moduleName = moduleName.remove(0, moduleName.lastIndexOf("/")+1);
+ 
+-  PyEval_AcquireLock();
++  PyThreadState *state = nullptr;
++  PyEval_AcquireThread(state);
+   
+   PyObject *pyModule;
+   if (autoReload) {
+@@ -152,11 +154,11 @@
+   } else {
+   pyModule = 
PyImport_ImportModule((char*)moduleName.toStdString().c_str());
+   }
+-  if (PyErr_Occurred()) { PyErr_Print(); PyEval_ReleaseLock(); return 
NULL; }
++  if (PyErr_Occurred()) { PyErr_Print(); PyEval_ReleaseThread(state); 
return NULL; }
+ 
+   // Get function object
+   PyObject *pyFunction = PyObject_GetAttrString(pyModule, 
(char*)function.toStdString().c_str());
+-  if (PyErr_Occurred()) { PyErr_Print(); PyEval_ReleaseLock(); return 
NULL; }
++  if (PyErr_Occurred()) { PyErr_Print(); PyEval_ReleaseThread(state); 
return NULL; }
+ 
+   // Call the actual function
+   PyObject *ret;
+@@ -164,7 +166,7 @@
+   ret = PyEval_CallObject(pyFunction, pyArgs);
+   else
+   ret = PyEval_CallObject(pyFunction, NULL);
+-  if (PyErr_Occurred()) { PyErr_Print(); PyEval_ReleaseLock(); return 
NULL; }
++  if (PyErr_Occurred()) { PyErr_Print(); PyEval_ReleaseThread(state); 
return NULL; }
+ 
+ //Py_DECREF(pyFunction); // -Matevz
+ //Py_DECREF(pyModule); // -Matevz
+@@ -172,7 +174,7 @@
+ //for (int i=0; ilock();
+   _thrWait->wait(_thrWaitMut);
+ //Py_END_ALLOW_THREADS
+ 
+-PyEval_AcquireLock();
++PyThreadState *state = nullptr;
++PyEval_AcquireThread(state);
+ PyThreadState_Swap(CASwigPython::pycliThreadState);
+ 
+   QString *str = new QString(_bufSend);   //put contents of _bufSend into 
buffer \todo: synch

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2017-11-01 Thread Antonio Rojas 
Date: Wednesday, November 1, 2017 @ 09:46:37
  Author: arojas
Revision: 264970

Update to 0.7.3r1, switch to Qt5

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-01 09:45:23 UTC (rev 264969)
+++ PKGBUILD2017-11-01 09:46:37 UTC (rev 264970)
@@ -5,23 +5,22 @@
 # Contributor: hm_b 
 
 pkgname=canorus
-pkgver=0.7.2rc1
-pkgrel=2
+pkgver=0.7.3rc1
+pkgrel=1
 pkgdesc="A free music score editor"
 arch=('i686' 'x86_64')
 url="http://www.canorus.org/;
 license=('GPL')
-depends=('qt4' 'alsa-lib' 'python2' 'zlib')
-makedepends=('cmake' 'swig')
-source=("http://downloads.sourceforge.net/project/canorus/0.7.2/canorus-${pkgver}.tar.bz2;)
-md5sums=('df5ea87e22aefe742be4e49e566b46f1')
+depends=('qt5-svg' 'qt5-webengine' 'alsa-lib' 'zlib' 'python')
+makedepends=('cmake' 'swig' 'qt5-tools' 'ruby')
+source=("http://downloads.sourceforge.net/project/canorus/0.7.3/canorus-${pkgver}.tar.bz2;)
+sha256sums=('e363f3cdb382a78d22c0c41541ed087197ddb3df1b981ec80072ec52f9c4')
 
 build() {
   cd $pkgname-$pkgver
-  export LDFLAGS="-lz -lpthread"
+  export CXXFLAGS+=" -Wno-misleading-indentation -Wno-dangling-else"
   cmake . -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr \
-   -DDEFAULT_DATA_DIR="/usr/share/canorus" \
-   -DNO_SWIG=ON
+   -DDEFAULT_DATA_DIR="/usr/share/canorus"
 }
 
 package() {

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2015-12-06 Thread Bartłomiej Piotrowski 
Date: Sunday, December 6, 2015 @ 23:44:40
  Author: bpiotrowski
Revision: 149309

C++11 ABI rebuild

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 22:44:20 UTC (rev 149308)
+++ PKGBUILD2015-12-06 22:44:40 UTC (rev 149309)
@@ -6,7 +6,7 @@
 
 pkgname=canorus
 pkgver=0.7.2rc1
-pkgrel=1
+pkgrel=2
 pkgdesc="A free music score editor"
 arch=('i686' 'x86_64')
 url="http://www.canorus.org/;

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2015-06-01 Thread Sergej Pupykin 
Date: Monday, June 1, 2015 @ 15:25:49
  Author: spupykin
Revision: 134473

upgpkg: canorus 0.7.2rc1-1

upd

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-01 12:59:58 UTC (rev 134472)
+++ PKGBUILD2015-06-01 13:25:49 UTC (rev 134473)
@@ -5,8 +5,8 @@
 # Contributor: hm_b holger (at) music-nerds (dot) net
 
 pkgname=canorus
-pkgver=0.7.R1002
-pkgrel=6
+pkgver=0.7.2rc1
+pkgrel=1
 pkgdesc=A free music score editor
 arch=('i686' 'x86_64')
 url=http://www.canorus.org/;
@@ -13,8 +13,8 @@
 license=('GPL')
 depends=('qt4' 'alsa-lib' 'python2' 'zlib')
 makedepends=('cmake' 'swig')
-source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2)
-md5sums=('5575b7c54633056a463177579a390318')
+source=(http://downloads.sourceforge.net/project/canorus/0.7.2/canorus-${pkgver}.tar.bz2;)
+md5sums=('df5ea87e22aefe742be4e49e566b46f1')
 
 build() {
   cd $pkgname-$pkgver

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2014-05-28 Thread Sergej Pupykin 
Date: Wednesday, May 28, 2014 @ 18:29:51
  Author: spupykin
Revision: 112018

upgpkg: canorus 0.7.R1002-6

upd

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-28 16:26:31 UTC (rev 112017)
+++ PKGBUILD2014-05-28 16:29:51 UTC (rev 112018)
@@ -6,13 +6,13 @@
 
 pkgname=canorus
 pkgver=0.7.R1002
-pkgrel=5
+pkgrel=6
 pkgdesc=A free music score editor
 arch=('i686' 'x86_64')
 url=http://www.canorus.org/;
 license=('GPL')
-depends=('qt4' 'alsa-lib' 'python2' 'swig' 'zlib')
-makedepends=('cmake')
+depends=('qt4' 'alsa-lib' 'python2' 'zlib')
+makedepends=('cmake' 'swig')
 source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2)
 md5sums=('5575b7c54633056a463177579a390318')

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2014-03-01 Thread Andrea Scarpino 
Date: Saturday, March 1, 2014 @ 09:32:15
  Author: andrea
Revision: 106367

Fix build

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-01 08:29:34 UTC (rev 106366)
+++ PKGBUILD2014-03-01 08:32:15 UTC (rev 106367)
@@ -13,13 +13,11 @@
 license=('GPL')
 depends=('qt4' 'alsa-lib' 'python2' 'swig' 'zlib')
 makedepends=('cmake')
-options=('strip')
 source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2)
 md5sums=('5575b7c54633056a463177579a390318')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  source /etc/profile.d/qt4.sh
+  cd $pkgname-$pkgver
   export LDFLAGS=-lz -lpthread
   cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \
-DDEFAULT_DATA_DIR=/usr/share/canorus \
@@ -27,7 +25,7 @@
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make install
   install -d $pkgdir/usr/share/{applications,pixmaps}
   cp canorus.desktop $pkgdir/usr/share/applications

[arch-commits] Commit in canorus/trunk (PKGBUILD)

2013-02-26 Thread Sergej Pupykin 
Date: Tuesday, February 26, 2013 @ 18:11:55
  Author: spupykin
Revision: 85001

upgpkg: canorus 0.7.R1002-5

upd

Modified:
  canorus/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-26 17:06:43 UTC (rev 85000)
+++ PKGBUILD2013-02-26 17:11:55 UTC (rev 85001)
@@ -11,7 +11,7 @@
 arch=('i686' 'x86_64')
 url=http://www.canorus.org/;
 license=('GPL')
-depends=('qt4' 'alsa-lib' 'python2' 'swig')
+depends=('qt4' 'alsa-lib' 'python2' 'swig' 'zlib')
 makedepends=('cmake')
 options=('strip')
 source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2)
@@ -20,6 +20,7 @@
 build() {
   cd $srcdir/$pkgname-$pkgver
   source /etc/profile.d/qt4.sh
+  export LDFLAGS=-lz -lpthread
   cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \
-DDEFAULT_DATA_DIR=/usr/share/canorus \
-DNO_SWIG=ON