diff options
| author | saxonbeta | 2022-08-06 17:58:02 -0500 |
|---|---|---|
| committer | saxonbeta | 2022-08-06 17:58:02 -0500 |
| commit | 8fa1f9aa10e9baa2f55a812e2f5efaa3ae3c619c (patch) | |
| tree | bc4b69b70c4450aae2f635cde98659603b185b4d | |
| parent | 6afcbf93ac93aa01fc8cec15450d25e7c8f53daf (diff) | |
| download | aur-fityk.tar.gz | |
Update to v1.3.2
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | gtk3_fix.patch | 31 |
3 files changed, 12 insertions, 47 deletions
@@ -1,20 +1,18 @@ pkgbase = fityk pkgdesc = A program for nonlinear fitting of analytical functions to data. - pkgver = 1.3.1 - pkgrel = 5 + pkgver = 1.3.2 + pkgrel = 1 url = http://fityk.nieto.pl/ arch = i686 arch = x86_64 license = GPL makedepends = boost makedepends = swig - depends = lua53 + depends = lua depends = wxwidgets-gtk3 depends = xylib>=1.4 options = !libtool - source = https://github.com/wojdyr/fityk/releases/download/v1.3.1/fityk-1.3.1.tar.bz2 - source = gtk3_fix.patch::https://github.com/wojdyr/fityk/commit/85ea545db65d7c6fbb94988b85f1e8cf1c9cbba5.patch - sha256sums = 3d88feb96dbdca70fbfb5f8fa994cea01e77723751e5957094ca46a0c6d511fe - sha256sums = ffdad5780cdc3df78d0010134aa5339cdf8f93f3f5ab20e173ed01e3b5d5d27a + source = https://github.com/wojdyr/fityk/releases/download/v1.3.2/fityk-1.3.2.tar.bz2 + sha256sums = 6da5eb6279d90b241108e36c2d4880cafec82d7225a5d49a28675a07b4360f0b pkgname = fityk @@ -5,29 +5,27 @@ # Contributor: Cuneyt Unlu <unlucu AT gmail.com> pkgname=fityk -pkgver=1.3.1 -pkgrel=5 +pkgver=1.3.2 +pkgrel=1 pkgdesc="A program for nonlinear fitting of analytical functions to data." arch=(i686 x86_64) url="http://fityk.nieto.pl/" license=('GPL') -depends=('lua53' 'wxwidgets-gtk3' 'xylib>=1.4') +depends=('lua' 'wxwidgets-gtk3' 'xylib>=1.4') makedepends=('boost' 'swig') options=(!libtool) -source=("https://github.com/wojdyr/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" - gtk3_fix.patch::"https://github.com/wojdyr/fityk/commit/85ea545db65d7c6fbb94988b85f1e8cf1c9cbba5.patch") -sha256sums=('3d88feb96dbdca70fbfb5f8fa994cea01e77723751e5957094ca46a0c6d511fe' - 'ffdad5780cdc3df78d0010134aa5339cdf8f93f3f5ab20e173ed01e3b5d5d27a') +source=("https://github.com/wojdyr/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2") +sha256sums=('6da5eb6279d90b241108e36c2d4880cafec82d7225a5d49a28675a07b4360f0b') prepare(){ cd "$srcdir/$pkgname-$pkgver" - patch -p1 < ../gtk3_fix.patch + #patch -p1 < ../gtk3_fix.patch } build() { cd "$srcdir/$pkgname-$pkgver" - ./configure LUA_INCLUDE=-I/usr/include/lua5.3 LUA=/usr/bin/lua5.3 CXXFLAGS="${CXXFLAGS} -std=c++14" --prefix=/usr + ./configure CXXFLAGS="${CXXFLAGS} -std=c++14" --prefix=/usr make } diff --git a/gtk3_fix.patch b/gtk3_fix.patch deleted file mode 100644 index 7b64f7f582fa..000000000000 --- a/gtk3_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 85ea545db65d7c6fbb94988b85f1e8cf1c9cbba5 Mon Sep 17 00:00:00 2001 -From: Marcin Wojdyr <wojdyr@gmail.com> -Date: Sun, 17 Jan 2021 19:18:47 +0100 -Subject: [PATCH] allow building with wxGTK3 (closes #32) - -It works, but with some problems. - -The separator in wxSplitterWindow is not updated, as per: -http://trac.wxwidgets.org/ticket/16890 - -wxSpinCtrl is much wider (it has [+][-] instead of arrows) ---- - wxgui/app.cpp | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/wxgui/app.cpp b/wxgui/app.cpp -index 526c8f14..1041eccf 100644 ---- a/wxgui/app.cpp -+++ b/wxgui/app.cpp -@@ -8,11 +8,6 @@ - #include <wx/filesys.h> - #include <wx/tooltip.h> - --#ifdef __WXGTK3__ --#error "Not everything is working with wxGTK3. Use default wxGTK instead, " \ -- "based on GTK+2. If you want to test it, just remove this #error." --#endif -- - #include <stdio.h> - #include <stdlib.h> - #include <vector> |