summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--0001-Fixed-GCC5-build-errors.patch111
-rw-r--r--PKGBUILD17
-rw-r--r--glibmm.patch10
4 files changed, 14 insertions, 140 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f411982c740..8941f101c91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
+# Generated by mksrcinfo v8
+# Sun Oct 22 20:37:01 UTC 2017
pkgbase = pcb2gcode
pkgdesc = Gerber to gcode file converter
- pkgver = 1.2.2
- pkgrel = 2
+ pkgver = 1.3.2
+ pkgrel = 1
url = https://github.com/pcb2gcode/pcb2gcode/wiki
arch = i686
arch = x86_64
license = GPL
+ depends = boost-libs
+ depends = gtkmm
depends = gerbv-git
- source = https://github.com/pcb2gcode/pcb2gcode/releases/download/v1.2.2/pcb2gcode-1.2.2.tar.gz
- source = 0001-Fixed-GCC5-build-errors.patch
- source = glibmm.patch
- md5sums = cacb0d0b7ab58ff1b6b45353bb2ebd55
- md5sums = ef0e42b4a9173e290845aa6e91a61f34
- md5sums = 8d1ea64839d36b359dfb4ad8131b7e73
+ source = https://github.com/pcb2gcode/pcb2gcode/releases/download/v1.3.2/pcb2gcode-1.3.2.tar.gz
+ md5sums = 60fb7e9878f082992a95359356d609b6
pkgname = pcb2gcode
diff --git a/0001-Fixed-GCC5-build-errors.patch b/0001-Fixed-GCC5-build-errors.patch
deleted file mode 100644
index 261f618b564..00000000000
--- a/0001-Fixed-GCC5-build-errors.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From e6580db4365c9f3ad42cea103382faeaf472800f Mon Sep 17 00:00:00 2001
-From: Nicola Corna <nicola@corna.info>
-Date: Mon, 9 Nov 2015 20:38:03 +0100
-Subject: [PATCH] Fixed GCC5 build errors
-
----
- drill.cpp | 5 ++++-
- layer.cpp | 1 -
- ngc_exporter.cpp | 6 +++++-
- outline_bridges.cpp | 12 +++++++-----
- svg_exporter.cpp | 1 -
- 5 files changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/drill.cpp b/drill.cpp
-index ec4c6f2..b6dfdcf 100644
---- a/drill.cpp
-+++ b/drill.cpp
-@@ -26,7 +26,6 @@ using std::endl;
-
- #include <fstream>
- #include <iomanip>
--using namespace std;
-
- #include "drill.hpp"
-
-@@ -41,6 +40,10 @@ using std::pair;
- using std::make_pair;
- using std::max;
- using std::min_element;
-+using std::cerr;
-+using std::ios_base;
-+using std::setw;
-+using std::left;
-
- /******************************************************************************/
- /*
-diff --git a/layer.cpp b/layer.cpp
-index 8f482cb..272d0dd 100644
---- a/layer.cpp
-+++ b/layer.cpp
-@@ -36,7 +36,6 @@ Layer::Layer(const string& name, shared_ptr<Surface> surface,
- }
-
- #include <iostream>
--using namespace std;
-
- /******************************************************************************/
- /*
-diff --git a/ngc_exporter.cpp b/ngc_exporter.cpp
-index 5604a7e..8126a01 100644
---- a/ngc_exporter.cpp
-+++ b/ngc_exporter.cpp
-@@ -24,8 +24,12 @@
- #include <boost/foreach.hpp>
- #include <boost/algorithm/string.hpp>
- #include <iostream>
-+using std::cerr;
-+using std::ios_base;
-+using std::setw;
-+using std::left;
-+
- #include <iomanip>
--using namespace std;
-
- #include <glibmm/miscutils.h>
- using Glib::build_filename;
-diff --git a/outline_bridges.cpp b/outline_bridges.cpp
-index e5a5135..0b973f7 100644
---- a/outline_bridges.cpp
-+++ b/outline_bridges.cpp
-@@ -63,7 +63,7 @@ vector< pair< unsigned int, double > > outline_bridges::findLongestSegments ( co
- vector<unsigned int> outline_bridges::insertBridges ( shared_ptr<icoords> path, vector< pair< unsigned int, double > > chosenSegments, double length )
- {
- vector<unsigned int> output;
-- icoords temp;
-+ icoords temp (2);
-
- path->reserve( path->size() + chosenSegments.size() * 2 ); //Just to avoid unnecessary reallocations
- std::sort( chosenSegments.begin(), chosenSegments.end(), boost::bind(&pair<unsigned int, double>::first, _1) <
-@@ -72,10 +72,12 @@ vector<unsigned int> outline_bridges::insertBridges ( shared_ptr<icoords> path,
- for( unsigned int i = 0; i < chosenSegments.size(); i++ )
- {
- chosenSegments[i].first += 2 * i; //Each time we insert a bridge all following indexes have a offset of 2, we compensate it
-- temp = boost::assign::list_of( intermediatePoint( path->at( chosenSegments[i].first ), path->at( chosenSegments[i].first + 1 ),
-- 0.5 - ( length / chosenSegments[i].second ) / 2 ) )
-- ( intermediatePoint( path->at( chosenSegments[i].first ), path->at( chosenSegments[i].first + 1 ),
-- 0.5 + ( length / chosenSegments[i].second ) / 2 ) );
-+ temp.at(0) = intermediatePoint( path->at( chosenSegments[i].first ),
-+ path->at( chosenSegments[i].first + 1 ),
-+ 0.5 - ( length / chosenSegments[i].second ) / 2 );
-+ temp.at(1) = intermediatePoint( path->at( chosenSegments[i].first ),
-+ path->at( chosenSegments[i].first + 1 ),
-+ 0.5 + ( length / chosenSegments[i].second ) / 2 );
- path->insert( path->begin() + chosenSegments[i].first + 1, temp.begin(), temp.end() ); //Insert the bridges in the path
- output.push_back( chosenSegments[i].first + 1 ); //Add the bridges indexes to output
- }
-diff --git a/svg_exporter.cpp b/svg_exporter.cpp
-index d094d8d..34f0821 100644
---- a/svg_exporter.cpp
-+++ b/svg_exporter.cpp
-@@ -23,7 +23,6 @@ using std::endl;
-
- #include <fstream>
- #include <iomanip>
--using namespace std;
-
- #include "svg_exporter.hpp"
-
---
-2.6.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 3cde3af99a9..f280368976e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,19 @@
# Contributor: Pierre DOUCET <pierre at equinoxefr.org>
pkgname=pcb2gcode
-pkgver=1.2.2
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
pkgdesc="Gerber to gcode file converter"
arch=('i686' 'x86_64')
url="https://github.com/pcb2gcode/pcb2gcode/wiki"
license=('GPL')
-depends=('gerbv-git')
-source=("https://github.com/pcb2gcode/pcb2gcode/releases/download/v${pkgver}/pcb2gcode-${pkgver}.tar.gz"
- '0001-Fixed-GCC5-build-errors.patch'
- 'glibmm.patch')
-md5sums=('cacb0d0b7ab58ff1b6b45353bb2ebd55'
- 'ef0e42b4a9173e290845aa6e91a61f34'
- '8d1ea64839d36b359dfb4ad8131b7e73')
+depends=('boost-libs' 'gtkmm' 'gerbv-git')
+source=("https://github.com/pcb2gcode/pcb2gcode/releases/download/v${pkgver}/pcb2gcode-${pkgver}.tar.gz")
+md5sums=('60fb7e9878f082992a95359356d609b6')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../0001-Fixed-GCC5-build-errors.patch
- patch -p1 -i ../glibmm.patch
+
autoreconf -i
}
diff --git a/glibmm.patch b/glibmm.patch
deleted file mode 100644
index 884e52f43b5..00000000000
--- a/glibmm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am 2015-11-18 18:01:02.598535720 +0100
-+++ b/Makefile.am 2015-11-18 18:13:52.556536170 +0100
-@@ -34,7 +34,7 @@
-
- ACLOCAL_AMFLAGS = -I m4
-
--AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(glibmm_CFLAGS) $(gdkmm_CFLAGS) $(gerbv_CFLAGS)
-+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(glibmm_CFLAGS) $(gdkmm_CFLAGS) $(gerbv_CFLAGS) -std=c++11
- AM_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-