[kicad/rawhide/user/lkundrak/kicad-2015.01.02: 1/2] Update to a later snapshot
Lubomir Rintel
lkundrak at fedoraproject.org
Sat Jan 3 14:40:10 UTC 2015
commit 68a99a29e171af73983931e25de9e7ee66599b34
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Sat Jan 3 15:31:47 2015 +0100
Update to a later snapshot
.gitignore | 5 +++
kicad-2014.03.13-fp-lib.patch | 55 ------------------------------------
kicad-2014.03.13-freerouting.patch | 35 -----------------------
kicad-2014.03.13-nostrip.patch | 19 ------------
kicad-2015.01.02-freerouting.patch | 52 ++++++++++++++++++++++++++++++++++
kicad-2015.01.02-nostrip.patch | 21 +++++++++++++
kicad-clone.sh | 2 +-
kicad-export.sh | 8 ++--
kicad-walter-libs.sh | 2 +-
kicad.spec | 28 +++++++-----------
pcb_calculator-desktop-fix.patch | 12 --------
sources | 10 +++---
12 files changed, 100 insertions(+), 149 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b6a2630..d1382c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,8 @@ kicad-libraries-2010.05.27.tar.bz2
/kicad-doc-2014.03.13.tar.xz
/kicad-walter-libraries-2014.03.13.tar.xz
/kicad-footprints-2014.03.13.tar.xz
+/kicad-2015.01.02.tar.xz
+/kicad-doc-2015.01.02.tar.xz
+/kicad-footprints-2015.01.02.tar.xz
+/kicad-libraries-2015.01.02.tar.xz
+/kicad-walter-libraries-2015.01.02.tar.xz
diff --git a/kicad-2015.01.02-freerouting.patch b/kicad-2015.01.02-freerouting.patch
new file mode 100644
index 0000000..fe498f7
--- /dev/null
+++ b/kicad-2015.01.02-freerouting.patch
@@ -0,0 +1,52 @@
+From f81cb9527e29c6a6ef21d9040162b42e31c40e44 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Wed, 24 Dec 2014 09:53:49 +0100
+Subject: [PATCH] Try to run freerouting by its JPackage launcher script
+
+It's a sin to touch the Java tool by its JAR file in Fedora.
+---
+ pcbnew/dialogs/dialog_freeroute_exchange.cpp | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff -urp kicad-2015.01.02/pcbnew/dialogs/dialog_freeroute_exchange.cpp kicad-2015.01.02.good/pcbnew/dialogs/dialog_freeroute_exchange.cpp
+--- kicad-2015.01.02/pcbnew/dialogs/dialog_freeroute_exchange.cpp 2015-01-02 22:15:35.000000000 +0100
++++ kicad-2015.01.02.good/pcbnew/dialogs/dialog_freeroute_exchange.cpp 2015-01-03 11:25:55.393054653 +0100
+@@ -80,7 +80,12 @@ void DIALOG_FREEROUTE::MyInit()
+ wxConfigBase* cfg = Kiface().KifaceSettings();
+ cfg->Read( FREEROUTE_RUN_KEY, &msg );
+ */
+- wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
++ wxFileName fileName( FindKicadFile( wxT( "freeroute" ) ), wxPATH_UNIX );
++
++ if( !fileName.FileExists() )
++ {
++ fileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
++ }
+
+ if( fileName.FileExists() )
+ {
+@@ -144,8 +149,22 @@ void DIALOG_FREEROUTE::OnLaunchButtonCli
+ return;
+ }
+
+- wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
+- wxString command;
++ wxFileName jarfileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
++ wxString command = wxT( "" );
++
++ if( jarfileName.FileExists() )
++ {
++ command << wxChar( '"' ) << jarfileName.GetFullPath() << wxChar( '"' );
++ // add option to load the .dsn file
++ command << wxT( " -de " );
++ // add *.dsn full filename (quoted):
++ command << wxChar( '"' ) << dsnFile << wxChar( '"' );
++
++ ProcessExecute( command );
++ return;
++ } else {
++ jarfileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
++ }
+
+ // Find the Java application on Windows.
+ // Colud be no more needed since we now have to run only java, not java web start
diff --git a/kicad-2015.01.02-nostrip.patch b/kicad-2015.01.02-nostrip.patch
new file mode 100644
index 0000000..2e72993
--- /dev/null
+++ b/kicad-2015.01.02-nostrip.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index af87f4b..f002416 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -186,7 +186,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+ endif()
+
+ if( MINGW )
+- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
+
+ # _UNICODE definition seems needed under mingw/gcc 4.8
+ # (Kicad uses unicode, and on Windows, wxWidgets >= 2.9.4 is mandatory
+@@ -223,8 +222,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+ set( CMAKE_SHARED_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
+ set( CMAKE_MODULE_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
+
+- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
+-
+ # Defeat ELF's ability to use the GOT to replace locally implemented functions
+ # with ones from another module.
+ # https://bugs.launchpad.net/kicad/+bug/1322354
diff --git a/kicad-clone.sh b/kicad-clone.sh
index 04a3a70..829f9cb 100755
--- a/kicad-clone.sh
+++ b/kicad-clone.sh
@@ -5,7 +5,7 @@ bzr checkout lp:kicad kicad.bzr
bzr checkout lp:~kicad-product-committers/kicad/library kicad-library.bzr
bzr branch --stacked lp:~kicad-developers/kicad/doc kicad-doc.bzr
-fps () { sed -n 's|.*\${KIGITHUB}/\([^)]*\)).*|\1|p' kicad-library.bzr/template/fp-lib-table.for-github }
+fps () { sed -n 's|.*\${KIGITHUB}/\([^)]*\)).*|\1|p' kicad-library.bzr/template/fp-lib-table.for-github; }
mkdir -p footprints
fps |while read FP
diff --git a/kicad-export.sh b/kicad-export.sh
index c1b2994..a62080f 100755
--- a/kicad-export.sh
+++ b/kicad-export.sh
@@ -1,10 +1,10 @@
#!/bin/sh
set -e
-TIMESTAMP="2014.03.13"
-MAIN_REV=4744
-LIB_REV=333
-DOC_REV=560
+TIMESTAMP="2015.01.02"
+MAIN_REV=5348
+LIB_REV=463
+DOC_REV=652
cd kicad.bzr
bzr export -r $MAIN_REV kicad-$TIMESTAMP
diff --git a/kicad-walter-libs.sh b/kicad-walter-libs.sh
index 82b4da6..af115c3 100755
--- a/kicad-walter-libs.sh
+++ b/kicad-walter-libs.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-TIMESTAMP="2014.03.13"
+TIMESTAMP="2015.01.02"
mkdir -p kicad-walter
cd kicad-walter
diff --git a/kicad.spec b/kicad.spec
index 97d8807..8a1dd45 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,6 +1,6 @@
Name: kicad
-Version: 2014.03.13
-Release: 10.rev4744%{?dist}
+Version: 2015.01.02
+Release: 1.rev5348%{?dist}
Summary: Electronic schematic diagrams and printed circuit board artwork
Summary(fr): Saisie de schéma électronique et routage de circuit imprimé
@@ -25,17 +25,16 @@ Source3: %{name}-footprints-%{version}.tar.xz
Source7: Epcos-MKT-1.0.tar.bz2
Source8: %{name}-walter-libraries-%{version}.tar.xz
-Patch0: pcb_calculator-desktop-fix.patch
-Patch1: kicad-2014.03.13-nostrip.patch
-Patch2: kicad-2014.03.13-fp-lib.patch
-Patch3: kicad-2014.03.13-freerouting.patch
+Patch1: kicad-2015.01.02-nostrip.patch
+Patch2: kicad-2015.01.02-freerouting.patch
BuildRequires: desktop-file-utils
-BuildRequires: wxGTK-devel
+BuildRequires: wxGTK3-devel
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: glew-devel
+BuildRequires: openssl-devel
Requires: electronics-menu
Requires: freerouting
@@ -184,13 +183,8 @@ Documentation and tutorials for Kicad in Chinese
%prep
%setup -q -a 1 -a 2 -a 3 -a 7 -a 8
-%patch0 -p1
%patch1 -p1
-%patch3 -p1
-
-cd %{name}-libraries-%{version}
%patch2 -p1
-cd ..
#kicad-doc.noarch: W: file-not-utf8 /usr/share/doc/kicad/AUTHORS.txt
iconv -f iso8859-1 -t utf-8 AUTHORS.txt > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS.txt
@@ -229,7 +223,8 @@ popd
#
# Core components
#
-%cmake -DKICAD_STABLE_VERSION=OFF -DKICAD_SKIP_BOOST=ON
+%cmake -DKICAD_STABLE_VERSION=OFF -DKICAD_SKIP_BOOST=ON \
+ -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-config-3.0
%{__make} -j1 VERBOSE=1
@@ -282,10 +277,6 @@ ln -f %{buildroot}%{_datadir}/%{name}/template/fp-lib-table{.for-pretty,}
%{__cp} -pr %{name}-doc-%{version}/doc/* %{buildroot}%{_docdir}/%{name}
%{__cp} -pr AUTHORS.txt CHANGELOG* %{buildroot}%{_docdir}/%{name}
-# Drop this, it's no longer able to webstart the freerouter
-# and we have it available locally anyway
-rm %{buildroot}%{_bindir}/*.jnlp
-
%find_lang %{name}
@@ -373,6 +364,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Sat Jan 03 2015 Lubomir Rintel <lkundrak at v3.sk> - 2015.01.02-1.rev5348
+- Update to a later snapshot
+
* Fri Jan 02 2015 Lubomir Rintel <lkundrak at v3.sk> - 2014.03.13-10.rev4744
- Use local autorouter
diff --git a/sources b/sources
index d92675d..f032175 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-f0a45487c81db32d7c97ea0fb59fc7d4 kicad-2014.03.13.tar.xz
-1e8870c0b80a9526b5285e5c90dead50 kicad-libraries-2014.03.13.tar.xz
-b886bbec5fc0e05f0d9a5d4f35119577 kicad-doc-2014.03.13.tar.xz
-4dd1da93067020c2ac690876a5e361a2 kicad-footprints-2014.03.13.tar.xz
-7d6f1b15a2ef24b77ac5982c06d889e6 kicad-walter-libraries-2014.03.13.tar.xz
4dba5eca85fcec9bba491c1815963f80 Epcos-MKT-1.0.tar.bz2
+17c9bb7c0e575b3a39e8e15c27cd24f2 kicad-2015.01.02.tar.xz
+69927e2ff6e2bac9eb18bf7bb226916d kicad-doc-2015.01.02.tar.xz
+c0e05498ad1a961a4fd22257e4e9b47c kicad-footprints-2015.01.02.tar.xz
+8f2112b42dd62498904d2e75ed8c738e kicad-libraries-2015.01.02.tar.xz
+ec565b317b0a7c98d5387366bf43fe5d kicad-walter-libraries-2015.01.02.tar.xz
More information about the scm-commits
mailing list