[arch-commits] Commit in wxmaxima/repos/extra-x86_64 (3 files)

Antonio Rojas arojas at archlinux.org
Sun Nov 11 21:19:45 UTC 2018


    Date: Sunday, November 11, 2018 @ 21:19:44
  Author: arojas
Revision: 339289

archrelease: copy trunk to extra-x86_64

Added:
  wxmaxima/repos/extra-x86_64/8bc9d69b.patch
    (from rev 339288, wxmaxima/trunk/8bc9d69b.patch)
  wxmaxima/repos/extra-x86_64/PKGBUILD
    (from rev 339288, wxmaxima/trunk/PKGBUILD)
Deleted:
  wxmaxima/repos/extra-x86_64/PKGBUILD

----------------+
 8bc9d69b.patch |   25 ++++++++++++++++
 PKGBUILD       |   81 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 69 insertions(+), 37 deletions(-)

Copied: wxmaxima/repos/extra-x86_64/8bc9d69b.patch (from rev 339288, wxmaxima/trunk/8bc9d69b.patch)
===================================================================
--- 8bc9d69b.patch	                        (rev 0)
+++ 8bc9d69b.patch	2018-11-11 21:19:44 UTC (rev 339289)
@@ -0,0 +1,25 @@
+From 8bc9d69bd9d2d66d890446af774a60bdca8179b1 Mon Sep 17 00:00:00 2001
+From: Mariusz Libera <mariusz.libera at gmail.com>
+Date: Wed, 7 Nov 2018 16:28:33 +0100
+Subject: [PATCH] fix wxgtk2 and wxgtk3 (#1049)
+
+based on changes suggested by @kosilin
+however I'm not sure if antialiassing works properly in wxgtk3 now
+---
+ src/MathCtrl.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/MathCtrl.cpp b/src/MathCtrl.cpp
+index 6e14afcd..d1e28cff 100644
+--- a/src/MathCtrl.cpp
++++ b/src/MathCtrl.cpp
+@@ -386,7 +386,7 @@ void MathCtrl::OnPaint(wxPaintEvent &WXUNUSED(event))
+ 
+   wxGCDC antiAliassingDC(dcm);
+ 
+-  #ifdef __WXGTK__
++  #if defined(__WXGTK__) && !defined(__WXGTK3__)
+   // Seems like depending on the wxGTK version the antialiassing DC doesn't inherit the
+   // scrolling info from the normal DC.
+   //
+ 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-11 21:19:16 UTC (rev 339288)
+++ PKGBUILD	2018-11-11 21:19:44 UTC (rev 339289)
@@ -1,37 +0,0 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Angelo Theodorou <encelo at users.sourceforge.net>
-# Contributor: Vinay S Shastry <vinayshastry at gmail.com>
-
-pkgname=wxmaxima
-pkgver=18.10.1
-pkgrel=1
-pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
-arch=('x86_64')
-url="https://wxmaxima-developers.github.io/wxmaxima/"
-license=('GPL2')
-depends=('maxima' 'libxml2' 'wxgtk3' 'ttf-linux-libertine')
-makedepends=('cmake')
-source=($pkgname-$pkgver.tar.gz::"https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${pkgver}.tar.gz")
-sha512sums=('fc1e3680482bef7f2f9adaacfafc76eefdc7f11278bb7eb2012c9988d33990b5afede88574f86ea80e192479624c1c7f2cd4b3964568c467545a8cc656142fbb')
-
-build() {
-  cd ${pkgname}-Version-${pkgver}
-  cmake . \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
-  make
-}
-
-#check() {
-#  cd ${pkgname}-Version-${pkgver}
-#  ./src/wxmaxima test/testbench_simple.wxmx
-#}
-
-package() {
-  cd ${pkgname}-Version-${pkgver}
-
-  make DESTDIR="${pkgdir}" install 
-
-  # Fix category in .desktop file
-  sed -i '/Categories=/c\Categories=Science;Math;' data/wxMaxima.desktop
-}

Copied: wxmaxima/repos/extra-x86_64/PKGBUILD (from rev 339288, wxmaxima/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-11-11 21:19:44 UTC (rev 339289)
@@ -0,0 +1,44 @@
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Angelo Theodorou <encelo at users.sourceforge.net>
+# Contributor: Vinay S Shastry <vinayshastry at gmail.com>
+
+pkgname=wxmaxima
+pkgver=18.10.2
+pkgrel=1
+pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
+arch=('x86_64')
+url="https://wxmaxima-developers.github.io/wxmaxima/"
+license=('GPL2')
+depends=('maxima' 'wxgtk3' 'ttf-linux-libertine')
+makedepends=('cmake')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${pkgver}.tar.gz"
+        8bc9d69b.patch)
+sha512sums=('96cabe17a1df4134d991c4a1104da76375429038da03df6a09729b8afaf279788cb0859d723bb1c9cf3e24782f63aeb198b9407515108e0e637c48c410b70a37'
+            'f9d083e3f752ca6bc04c152419b6bb1a71d3e5c25934de90cdf968240fe21d3574b180da7915acebaf15550f93a894e2505f1b4c9c3fc7b48caeee9bb3fab9af')
+
+prepare() {
+  cd $pkgname-Version-$pkgver
+  patch -p1 -i ../8bc9d69b.patch # https://bugs.archlinux.org/task/60704
+}
+
+build() {
+  cd ${pkgname}-Version-${pkgver}
+  cmake . \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+  make
+}
+
+#check() {
+#  cd ${pkgname}-Version-${pkgver}
+#  ./src/wxmaxima test/testbench_simple.wxmx
+#}
+
+package() {
+  cd ${pkgname}-Version-${pkgver}
+
+  make DESTDIR="${pkgdir}" install 
+
+  # Fix category in .desktop file
+  sed -i '/Categories=/c\Categories=Science;Math;' data/wxMaxima.desktop
+}


More information about the arch-commits mailing list