update to 1.2.2, moved to github releases from dead sourceforge

5 files changed, 154 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9995e91247..f03d3018115 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
 pkgbase = pcb2gcode
 	pkgdesc = Gerber to gcode file converter
-	pkgver = 1.1.4
+	pkgver = 1.2.2
 	pkgrel = 1
-	url = http://sourceforge.net/apps/mediawiki/pcb2gcode/index.php?title=Main_Page
+	url = https://github.com/pcb2gcode/pcb2gcode/wiki
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = gerbv=2.6.0
-	source = http://downloads.sourceforge.net/pcb2gcode/pcb2gcode-1.1.4-git2012-07-02.tar.gz
-	md5sums = 52c49627b04013fef16fedba2917efed
+	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 = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = pcb2gcode
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..2326f2f62a8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+pkg/
+src/
+*.swp
+*.pkg.tar.xz
+*.src.tar.gz
+
+*.tar.gz
+
diff --git a/0001-Fixed-GCC5-build-errors.patch b/0001-Fixed-GCC5-build-errors.patch
new file mode 100644
index 00000000000..261f618b564
--- /dev/null
+++ b/0001-Fixed-GCC5-build-errors.patch
@@ -0,0 +1,111 @@
+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 66d80440cc6..d3c8340e056 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,31 @@
 # Contributor: Pierre DOUCET <pierre at equinoxefr.org>
 
 pkgname=pcb2gcode
-pkgver=1.1.4
-_pkgver=1.1.4-git2012-07-02
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="Gerber to gcode file converter" 
 arch=('i686' 'x86_64')
-url="http://sourceforge.net/apps/mediawiki/pcb2gcode/index.php?title=Main_Page"
+url="https://github.com/pcb2gcode/pcb2gcode/wiki"
 license=('GPL')
-depends=('gerbv=2.6.0')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz")
-md5sums=('52c49627b04013fef16fedba2917efed')
+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=('SKIP'
+         'SKIP'
+         'SKIP')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../0001-Fixed-GCC5-build-errors.patch
+  patch -p1 -i ../glibmm.patch
+  autoreconf -i
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
-
-  # no binary due to broken libtool distributed with package
-  echo -e 'exec /usr/bin/libtool "$@"' > libtool
-
   make
 }
 
diff --git a/glibmm.patch b/glibmm.patch
new file mode 100644
index 00000000000..884e52f43b5
--- /dev/null
+++ b/glibmm.patch
@@ -0,0 +1,10 @@
+--- 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)
+