[arch-commits] Commit in kig/repos/extra-x86_64 (4 files)

Antonio Rojas arojas at archlinux.org
Thu Mar 5 13:47:38 UTC 2020


    Date: Thursday, March 5, 2020 @ 13:47:38
  Author: arojas
Revision: 376652

archrelease: copy trunk to extra-x86_64

Added:
  kig/repos/extra-x86_64/PKGBUILD
    (from rev 376651, kig/trunk/PKGBUILD)
  kig/repos/extra-x86_64/pykig-python3.patch
    (from rev 376651, kig/trunk/pykig-python3.patch)
Deleted:
  kig/repos/extra-x86_64/PKGBUILD
  kig/repos/extra-x86_64/pykig-python3.patch

---------------------+
 PKGBUILD            |   80 ++++++-------
 pykig-python3.patch |  286 +++++++++++++++++++++++++-------------------------
 2 files changed, 183 insertions(+), 183 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-05 13:47:28 UTC (rev 376651)
+++ PKGBUILD	2020-03-05 13:47:38 UTC (rev 376652)
@@ -1,40 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kig
-pkgver=19.12.2
-pkgrel=1
-pkgdesc="Interactive Geometry"
-url="https://kde.org/applications/education/kig/"
-arch=(x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kdeedu)
-depends=(ktexteditor qt5-xmlpatterns boost-libs hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools boost)
-source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
-         pykig-python3.patch)
-sha256sums=('5820eef5e3b28f642ba4f7fef8dc07a3bdf075079cea64de1482041bc18f42c7'
-            'SKIP'
-            'b801af24d560dd3928657cbcaed879b794b13038e0785681f5ba82368d1a8fd4')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../pykig-python3.patch # Port pykig to python 3
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kig/repos/extra-x86_64/PKGBUILD (from rev 376651, kig/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-05 13:47:38 UTC (rev 376652)
@@ -0,0 +1,40 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kig
+pkgver=19.12.3
+pkgrel=1
+pkgdesc="Interactive Geometry"
+url="https://kde.org/applications/education/kig/"
+arch=(x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdeedu)
+depends=(ktexteditor qt5-xmlpatterns boost-libs hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost)
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+         pykig-python3.patch)
+sha256sums=('1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3'
+            'SKIP'
+            'b801af24d560dd3928657cbcaed879b794b13038e0785681f5ba82368d1a8fd4')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../pykig-python3.patch # Port pykig to python 3
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: pykig-python3.patch
===================================================================
--- pykig-python3.patch	2020-03-05 13:47:28 UTC (rev 376651)
+++ pykig-python3.patch	2020-03-05 13:47:38 UTC (rev 376652)
@@ -1,143 +0,0 @@
-diff --git a/pykig/pykig.py b/pykig/pykig.py
-index 02f637d3..ee657792 100644
---- a/pykig/pykig.py
-+++ b/pykig/pykig.py
-@@ -170,9 +170,9 @@ class KigDocument(object):
-     self.of=of
-     try:
-       self.outfile = open(outfilename, 'w')
--    except IOError, value:
-+    except IOError as value:
- #      print >> sys.stderr, outfilename, 'unwritable'
--      print >> sys.stderr, value
-+      print(value,  file=sys.stderr)
-       sys.exit(2)
- #    KigOut._kigdocument=self
-     KigDOP._kd=self
-@@ -212,14 +212,14 @@ class KigDocument(object):
-       self.outfile.write(" </View>\n</KigDocument>\n")
-       if self.outfile != sys.stdout:
-         self.outfile.close()
--    except IOError, value:
--      print >> sys.stderr, value
-+    except IOError as value:
-+      print(value, file=sys.stderr)
-       sys.exit(2)
-     try:
-       if self.callkig:
-         err = os.system('kig ' + self.outfilename)
--    except Exception, value:
--      print >> sys.stderr, value      
-+    except Exception as value:
-+      print(value, file=sys.stderr)
-     if not self.of:
-       os.system('rm ' + self.outfilename)
- 
-@@ -501,7 +501,7 @@ def databuild(nomeclasse, nomekig, v="val"):
- 
- for d in data:
-   p1, p2, p3 = d
--  exec databuild(p1, p2, p3)
-+  exec (databuild(p1, p2, p3))
- 
- #####
- # Objects
-@@ -645,7 +645,7 @@ def objectbuild(nameclass, namekig, params, objparams):
- 
- for o in objects:
-   p1, p2, p3, p4 = o
--  exec objectbuild(p1, p2, p3, p4)
-+  exec (objectbuild(p1, p2, p3, p4))
- 
- #####
- # Properties
-@@ -688,7 +688,7 @@ def propertybuild(nameclass, namekig, params, objparams):
- 
- for p in property:
-   p1, p2, p3, p4 = p
--  exec propertybuild(p1, p2, p3, p4)
-+  exec (propertybuild(p1, p2, p3, p4))
- 
- #####
- # Start of properties definitions as Object's methods
-@@ -734,7 +734,7 @@ def methodsbuild(namekig):
- 
- for p in methods:
-   p1, p2, cl = p
--  exec methodsbuild(p1)
-+  exec (methodsbuild(p1))
-   for c in cl:
-     setattr(c, p2, method)
- 
-@@ -743,7 +743,7 @@ for p in methods:
- #####
- 
- def usage(codexit):
--  print >> sys.stderr, """
-+  print ("""
- usage: pykig.py [options...] file ...
- 
- Options:
-@@ -757,7 +757,7 @@ examples:
-     $ pykig.py my_file.kpy
-     $ pykig.py -o output_file.kig my_file.kpy
-     $ ...
--"""
-+""", file=sys.stderr)
-   sys.exit(codexit)
- 
- #####
-@@ -776,7 +776,7 @@ def prog():
-     _opts, _args = getopt.getopt(sys.argv[1:], "hvno:",\
-                                  ["help", "version", "nokig", "output="])
-   except getopt.GetoptError:
--    print "GetoptError"
-+    print ("GetoptError")
-     usage(2)
-   _callKig=True
-   _of=False
-@@ -784,7 +784,7 @@ def prog():
-     if _opt in ("-h", "--help"):
-       usage(0)
-     if _opt in ("-v", "--version"):
--      print "Version:", version
-+      print ("Version:", version)
-       sys.exit(0)
-     if _opt in ("-n", "--nokig"):
-       _callKig=False
-@@ -793,19 +793,19 @@ def prog():
-       _of=True
-       _callKig=False   # if there's an output file, don't call Kig
-   if len(_args)==0:
--    _infilename=raw_input("Input file name: ")
-+    _infilename=input("Input file name: ")
-     if not _infilename:
--      print "No input file name."
-+      print ("No input file name.")
-       usage(2)
-   elif len(_args)==1:
-     _infilename=_args[0]
-   else:
--    print "No input file name."
-+    print ("No input file name.")
-     usage(2)
-   try:
-     _infile = open(_infilename, 'r')
-   except:
--    print >> sys.stderr, _infilename, "input file can't be read."
-+    #print (_infilename, "input file can't be read.", file=sys.stderr)
-     sys.exit(2)
-   if _of:
-     if _outfilename=="-":
-@@ -817,9 +817,9 @@ def prog():
-   kigdocument=KigDocument(_outfilename, _callKig, _of)
-   kd=kigdocument
-   try:
--    execfile(_infilename, globals())
-+    exec(open(_infilename).read(), globals())
-   except:
--    print >> sys.stderr, 'Syntax error in', _infilename
-+    print ('Syntax error in', _infilename, file=sys.stderr)
-     _info = sys.exc_info()    # print out the traceback
-     traceback.print_exc()
-     sys.exit(3)

Copied: kig/repos/extra-x86_64/pykig-python3.patch (from rev 376651, kig/trunk/pykig-python3.patch)
===================================================================
--- pykig-python3.patch	                        (rev 0)
+++ pykig-python3.patch	2020-03-05 13:47:38 UTC (rev 376652)
@@ -0,0 +1,143 @@
+diff --git a/pykig/pykig.py b/pykig/pykig.py
+index 02f637d3..ee657792 100644
+--- a/pykig/pykig.py
++++ b/pykig/pykig.py
+@@ -170,9 +170,9 @@ class KigDocument(object):
+     self.of=of
+     try:
+       self.outfile = open(outfilename, 'w')
+-    except IOError, value:
++    except IOError as value:
+ #      print >> sys.stderr, outfilename, 'unwritable'
+-      print >> sys.stderr, value
++      print(value,  file=sys.stderr)
+       sys.exit(2)
+ #    KigOut._kigdocument=self
+     KigDOP._kd=self
+@@ -212,14 +212,14 @@ class KigDocument(object):
+       self.outfile.write(" </View>\n</KigDocument>\n")
+       if self.outfile != sys.stdout:
+         self.outfile.close()
+-    except IOError, value:
+-      print >> sys.stderr, value
++    except IOError as value:
++      print(value, file=sys.stderr)
+       sys.exit(2)
+     try:
+       if self.callkig:
+         err = os.system('kig ' + self.outfilename)
+-    except Exception, value:
+-      print >> sys.stderr, value      
++    except Exception as value:
++      print(value, file=sys.stderr)
+     if not self.of:
+       os.system('rm ' + self.outfilename)
+ 
+@@ -501,7 +501,7 @@ def databuild(nomeclasse, nomekig, v="val"):
+ 
+ for d in data:
+   p1, p2, p3 = d
+-  exec databuild(p1, p2, p3)
++  exec (databuild(p1, p2, p3))
+ 
+ #####
+ # Objects
+@@ -645,7 +645,7 @@ def objectbuild(nameclass, namekig, params, objparams):
+ 
+ for o in objects:
+   p1, p2, p3, p4 = o
+-  exec objectbuild(p1, p2, p3, p4)
++  exec (objectbuild(p1, p2, p3, p4))
+ 
+ #####
+ # Properties
+@@ -688,7 +688,7 @@ def propertybuild(nameclass, namekig, params, objparams):
+ 
+ for p in property:
+   p1, p2, p3, p4 = p
+-  exec propertybuild(p1, p2, p3, p4)
++  exec (propertybuild(p1, p2, p3, p4))
+ 
+ #####
+ # Start of properties definitions as Object's methods
+@@ -734,7 +734,7 @@ def methodsbuild(namekig):
+ 
+ for p in methods:
+   p1, p2, cl = p
+-  exec methodsbuild(p1)
++  exec (methodsbuild(p1))
+   for c in cl:
+     setattr(c, p2, method)
+ 
+@@ -743,7 +743,7 @@ for p in methods:
+ #####
+ 
+ def usage(codexit):
+-  print >> sys.stderr, """
++  print ("""
+ usage: pykig.py [options...] file ...
+ 
+ Options:
+@@ -757,7 +757,7 @@ examples:
+     $ pykig.py my_file.kpy
+     $ pykig.py -o output_file.kig my_file.kpy
+     $ ...
+-"""
++""", file=sys.stderr)
+   sys.exit(codexit)
+ 
+ #####
+@@ -776,7 +776,7 @@ def prog():
+     _opts, _args = getopt.getopt(sys.argv[1:], "hvno:",\
+                                  ["help", "version", "nokig", "output="])
+   except getopt.GetoptError:
+-    print "GetoptError"
++    print ("GetoptError")
+     usage(2)
+   _callKig=True
+   _of=False
+@@ -784,7 +784,7 @@ def prog():
+     if _opt in ("-h", "--help"):
+       usage(0)
+     if _opt in ("-v", "--version"):
+-      print "Version:", version
++      print ("Version:", version)
+       sys.exit(0)
+     if _opt in ("-n", "--nokig"):
+       _callKig=False
+@@ -793,19 +793,19 @@ def prog():
+       _of=True
+       _callKig=False   # if there's an output file, don't call Kig
+   if len(_args)==0:
+-    _infilename=raw_input("Input file name: ")
++    _infilename=input("Input file name: ")
+     if not _infilename:
+-      print "No input file name."
++      print ("No input file name.")
+       usage(2)
+   elif len(_args)==1:
+     _infilename=_args[0]
+   else:
+-    print "No input file name."
++    print ("No input file name.")
+     usage(2)
+   try:
+     _infile = open(_infilename, 'r')
+   except:
+-    print >> sys.stderr, _infilename, "input file can't be read."
++    #print (_infilename, "input file can't be read.", file=sys.stderr)
+     sys.exit(2)
+   if _of:
+     if _outfilename=="-":
+@@ -817,9 +817,9 @@ def prog():
+   kigdocument=KigDocument(_outfilename, _callKig, _of)
+   kd=kigdocument
+   try:
+-    execfile(_infilename, globals())
++    exec(open(_infilename).read(), globals())
+   except:
+-    print >> sys.stderr, 'Syntax error in', _infilename
++    print ('Syntax error in', _infilename, file=sys.stderr)
+     _info = sys.exc_info()    # print out the traceback
+     traceback.print_exc()
+     sys.exit(3)



More information about the arch-commits mailing list