diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | package.patch | 70 |
3 files changed, 7 insertions, 74 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Mar 12 12:26:21 UTC 2016 +# Mon Mar 14 10:35:54 UTC 2016 pkgbase = cadabra2-git pkgdesc = A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory. - pkgver = r506.37aff1a + pkgver = r514.c7f25d6 pkgrel = 1 url = http://cadabra.phi-sci.com/ install = package.install @@ -24,7 +24,7 @@ pkgbase = cadabra2-git source = package.patch source = cadabra2.desktop md5sums = SKIP - md5sums = cb724c009a3c2b2e3a1e30652c02f223 + md5sums = 9524a7c24d4fc70c6da409106048d04c md5sums = 3675066ab3a7f79b79f1657477dc03c4 pkgname = cadabra2-git @@ -1,6 +1,6 @@ # Maintainer: Tarn Burton <twburton at gmail dot com> pkgname='cadabra2-git' -pkgver=r506.37aff1a +pkgver=r514.c7f25d6 pkgrel=1 pkgdesc="A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('python2-matplotlib' 'gtkmm3' 'jsoncpp' 'mathjax' 'boost-libs<1.60.0' ' makedepends=('cmake' 'gcc' 'boost<1.60.0') source=("$pkgname::git+https://github.com/kpeeters/cadabra2" "package.patch" "cadabra2.desktop") md5sums=('SKIP' - 'cb724c009a3c2b2e3a1e30652c02f223' + '9524a7c24d4fc70c6da409106048d04c' '3675066ab3a7f79b79f1657477dc03c4') install=package.install @@ -41,5 +41,4 @@ package() { install -Dm644 "${srcdir}/cadabra2.desktop" "$pkgdir/usr/share/applications/cadabra2.desktop" install -Dm644 ../images/cadabra.png "$pkgdir/usr/share/icons/hicolor/64x64/apps/cadabra2.png" install -Dm644 ../images/cadabra.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/cadabra2.svg" - mv "$pkgdir/usr/share/texmf/tex/latex/cadabra" "$pkgdir/usr/share/texmf/tex/latex/cadabra2" } diff --git a/package.patch b/package.patch index dc5d7dceaf6a..aaa6c162362f 100644 --- a/package.patch +++ b/package.patch @@ -1,75 +1,9 @@ diff -aur -bZwB -x .git cadabra2-git.old/core/cadabra2 cadabra2-git/core/cadabra2 ---- cadabra2-git.old/core/cadabra2 2016-03-09 06:27:14.913479977 -0500 -+++ cadabra2-git/core/cadabra2 2016-03-09 06:27:21.173460323 -0500 +--- cadabra2-git.old/core/cadabra2 2016-03-08 06:55:56.245442657 -0500 ++++ cadabra2-git/core/cadabra2 2016-03-08 06:56:27.278519443 -0500 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # \ingroup pythoncore # -diff -aur -bZwB -x .git cadabra2-git.old/frontend/gtkmm/NotebookWindow.cc cadabra2-git/frontend/gtkmm/NotebookWindow.cc ---- cadabra2-git.old/frontend/gtkmm/NotebookWindow.cc 2016-03-09 06:27:14.920146624 -0500 -+++ cadabra2-git/frontend/gtkmm/NotebookWindow.cc 2016-03-09 06:27:21.173460323 -0500 -@@ -25,20 +25,15 @@ - #ifdef __APPLE__ - scale = 1.0; - #else -- settings_gnome = Gio::Settings::create("org.gnome.desktop.interface"); -- settings_cinnamon = Gio::Settings::create("org.cinnamon.desktop.interface"); -- double scale_gnome = settings_gnome->get_double("text-scaling-factor"); -- double scale_cinnamon = settings_cinnamon->get_double("text-scaling-factor"); -- scale = std::max(scale_gnome, scale_cinnamon); -+ settings = Gio::Settings::create((strcmp(std::getenv("DESKTOP_SESSION"), "cinnamon") == 0) ? "org.cinnamon.desktop.interface" : "org.gnome.desktop.interface"); -+ scale = settings->get_double("text-scaling-factor"); - #endif - engine.latex_packages.push_back("breqn"); - engine.latex_packages.push_back("hyperref"); - engine.set_scale(scale); - - #ifndef __APPLE__ -- settings_gnome->signal_changed().connect( -- sigc::mem_fun(*this, &NotebookWindow::on_text_scaling_factor_changed)); -- settings_cinnamon->signal_changed().connect( -+ settings->signal_changed().connect( - sigc::mem_fun(*this, &NotebookWindow::on_text_scaling_factor_changed)); - #endif - -@@ -1178,9 +1173,7 @@ - void NotebookWindow::on_text_scaling_factor_changed(const std::string& key) - { - if(key=="text-scaling-factor") { -- double scale_gnome = settings_gnome->get_double("text-scaling-factor"); -- double scale_cinnamon = settings_cinnamon->get_double("text-scaling-factor"); -- scale = std::max(scale_gnome, scale_cinnamon); -+ scale = settings->get_double("text-scaling-factor"); - std::cout << "cadabra-client: text-scaling-factor = " << scale << std::endl; - engine.set_scale(scale); - engine.invalidate_all(); -diff -aur -bZwB -x .git cadabra2-git.old/frontend/gtkmm/NotebookWindow.hh cadabra2-git/frontend/gtkmm/NotebookWindow.hh ---- cadabra2-git.old/frontend/gtkmm/NotebookWindow.hh 2016-03-09 06:27:14.920146624 -0500 -+++ cadabra2-git/frontend/gtkmm/NotebookWindow.hh 2016-03-09 06:27:33.753419200 -0500 -@@ -176,7 +176,7 @@ - // Styling through CSS - void setup_css_provider(); - Glib::RefPtr<Gtk::CssProvider> css_provider; -- Glib::RefPtr<Gio::Settings> settings_gnome, settings_cinnamon; -+ Glib::RefPtr<Gio::Settings> settings; - void on_text_scaling_factor_changed(const std::string& key); - - int last_configure_width; -diff -aur -bZwB -x .git cadabra2-git.old/web2/CMakeLists.txt cadabra2-git/web2/CMakeLists.txt ---- cadabra2-git.old/web2/CMakeLists.txt 2016-03-09 06:27:14.923479946 -0500 -+++ cadabra2-git/web2/CMakeLists.txt 2016-03-09 06:27:21.176793646 -0500 -@@ -24,6 +24,12 @@ - ARGS --segment ${CNBDIR}/for_previous_users.cnb ${HTMLOUTDIR}/for_previous_users.html - COMMENT "Creating for_previous_users.html") - -+add_custom_command(OUTPUT ${HTMLOUTDIR}/scalar_manipulations.html -+ DEPENDS ${CNBDIR}/scalar_manipulations.cnb ${DC} -+ COMMAND cadabra2html -+ ARGS --segment ${CNBDIR}/scalar_manipulations.cnb ${HTMLOUTDIR}/scalar_manipulations.html -+ COMMENT "Creating scalar_manipulations.html") -+ - add_custom_command(OUTPUT ${HTMLOUTDIR}/schwarzschild.html - DEPENDS ${CNBDIR}/schwarzschild.cnb ${DC} - COMMAND cadabra2html |