pool/librecad
SHA256
11
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 283705 from home:adra:branches:graphics

Browse Source 
Update to new upstream release 2.0.7, Added new Part Libraries Architect8-LCAD.zip and Electronics8-LCAD.zip, Added new build requirement unzip, Rebased patches

OBS-URL: https://build.opensuse.org/request/show/283705
OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=19
This commit is contained in:
Jan Engelhardt
2015-02-01 23:16:34 +00:00
committed by Git OBS Bridge
parent 6f532499cd
commit c08040b02b
8 changed files with 92 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Architect8-LCAD.zip Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87217b373f84f73820245fd5e69679a4eba334097fbfef56ae647d2d857863d4
size 78791

3
Electronics8-LCAD.zip Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:559938ae9a29d9224b22268a6bfa0046298a9738cbd9bec6ab556f585feeb3a4
size 414708

3
LibreCAD-2.0.4.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3d3f65a4510f1bb0d2b94e9917fa16c3f6425cf8e18d233857997e4e13d22f7
size 15526362

3
LibreCAD-2.0.7.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8ae88be5e2d1cac9c979c2922b52d33d4f156bff63ea217c646f6bc07f88c0d
size 16315416

16
librecad-install.diff
View File

@@ -3,11 +3,11 @@
scripts/postprocess-unix.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
Index: LibreCAD-2.0.2/librecad/src/src.pro
Index: LibreCAD-2.0.7/librecad/src/src.pro
===================================================================
--- LibreCAD-2.0.2.orig/librecad/src/src.pro
+++ LibreCAD-2.0.2/librecad/src/src.pro
@@ -58,7 +58,6 @@ unix {
--- LibreCAD-2.0.7.orig/librecad/src/src.pro
+++ LibreCAD-2.0.7/librecad/src/src.pro
@@ -61,7 +61,6 @@ unix {
DEFINES += QC_APPDIR="\"librecad\""
DEFINES += QINITIMAGES_LIBRECAD="qInitImages_librecad"
RC_FILE = ../res/main/librecad.icns
@@ -15,16 +15,16 @@ Index: LibreCAD-2.0.2/librecad/src/src.pro
}
}
win32 {
Index: LibreCAD-2.0.2/scripts/postprocess-unix.sh
Index: LibreCAD-2.0.7/scripts/postprocess-unix.sh
===================================================================
--- LibreCAD-2.0.2.orig/scripts/postprocess-unix.sh
+++ LibreCAD-2.0.2/scripts/postprocess-unix.sh
--- LibreCAD-2.0.7.orig/scripts/postprocess-unix.sh
+++ LibreCAD-2.0.7/scripts/postprocess-unix.sh
@@ -3,7 +3,7 @@
THISDIR="`pwd`"
LCDIR="${THISDIR}/librecad"
PIDIR="${THISDIR}/plugins"
-RESOURCEDIR="${THISDIR}/unix/resources"
+RESOURCEDIR=$BUILDDIR
APPDATADIR="${THISDIR}/unix/appdata"
TSDIRLC="${LCDIR}/ts"
TSDIRPI="${PIDIR}/ts"
SPTDIR="${LCDIR}/support"

18
librecad-use-system-libdxfrw.patch
View File

@@ -6,10 +6,10 @@ build: avoid using bundled libdxfrw
librecad/src/src.pro | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
Index: LibreCAD-2.0.4/libraries/libraries.pro
Index: LibreCAD-2.0.7/libraries/libraries.pro
===================================================================
--- LibreCAD-2.0.4.orig/libraries/libraries.pro
+++ LibreCAD-2.0.4/libraries/libraries.pro
--- LibreCAD-2.0.7.orig/libraries/libraries.pro
+++ LibreCAD-2.0.7/libraries/libraries.pro
@@ -9,7 +9,6 @@ TEMPLATE = subdirs
TARGET = libraries
@@ -17,12 +17,12 @@ Index: LibreCAD-2.0.4/libraries/libraries.pro
- libdxfrw \
jwwlib
macx|win32|equals(build_muparser, "true"){
Index: LibreCAD-2.0.4/librecad/src/src.pro
macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){
Index: LibreCAD-2.0.7/librecad/src/src.pro
===================================================================
--- LibreCAD-2.0.4.orig/librecad/src/src.pro
+++ LibreCAD-2.0.4/librecad/src/src.pro
@@ -37,7 +37,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
--- LibreCAD-2.0.7.orig/librecad/src/src.pro
+++ LibreCAD-2.0.7/librecad/src/src.pro
@@ -39,7 +39,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
CONFIG += help
}
@@ -30,7 +30,7 @@ Index: LibreCAD-2.0.4/librecad/src/src.pro
PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a
DESTDIR = $${INSTALLDIR}
@@ -86,7 +85,7 @@ LIBS += -L../../generated/lib \
@@ -88,7 +87,7 @@ LIBS += -L../../generated/lib \
-ljwwlib
DEPENDPATH += \

37
librecad.changes
View File

@@ -1,3 +1,40 @@
-------------------------------------------------------------------
Sat Jan 31 22:21:05 UTC 2015 - asterios.dramis@gmail.com
- Update to new upstream release 2.0.7:
* Major fixes: a serious command line regression since 2.0.6: keyboard
Enter/Esc support, command line widget in a second screen, etc. Also fixed
are some crashes for tangential circle drawing and polyline addition.
* LibreCAD 2.0.7 got a boost on LFF font support with kindly help from:
Petr on Czech fonts in unicode.lff
stranger573 on OpenGost
AZO on Japanese fonts kst32b.lff
* As a new command line feature introduced in 2.0.7, the command line can be
used as a calculator by typing math expression after command “cal”. For
example command “cal 1+1″ to get output “2″
* Many fixes and enhancements, see:
http://blog.librecad.org/
for details
From version 2.0.5:
* Interpolation spline， Draw->Spline->Spline Points (designed by Pavel
Krejcir).
* File -> Export as PDF.
* Korean language support.
* Smooth scrolling/zooming (designed by Oskar Linde).
* Allow user to hide splash at loading.
* gcc-4.10 support.
* Work-in-progress, finding enclosed area within a contour.
* Added appdata.xml.
* “Modify->Round” renamed to “Modify->Fillet”.
* Command line aliases can be made for both regular commands and short
commands.
* Fixed many bugs since the 2.0.4 release.
- Added new Part Libraries:
Architect8-LCAD.zip and Electronics8-LCAD.zip.
- Added new build requirement unzip.
- Rebased librecad-install.diff and librecad-use-system-libdxfrw.patch to apply
cleanly.
-------------------------------------------------------------------
Wed Aug 13 18:36:35 UTC 2014 - asterios.dramis@gmail.com

37
librecad.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package librecad
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: librecad
Version: 2.0.4
Version: 2.0.7
Release: 0
Summary: Computer-aided design (CAD) software package for 2D design and drafting
License: GPL-2.0 and (Apache-2.0 or SUSE-GPL-3.0+-with-font-exception)
@@ -26,10 +26,16 @@ Url: http://librecad.org/
#Git-Clone: git://github.com/LibreCAD/LibreCAD
#Git-Web: http://github.com/LibreCAD/LibreCAD/tags
#DL-URL: https://github.com/LibreCAD/LibreCAD/archive/2.0.3.tar.gz
#DL-URL: https://github.com/LibreCAD/LibreCAD/archive/2.0.7.tar.gz
Source0: LibreCAD-%version.tar.gz
Source1: ttf2lff.1
Source2: %name-rpmlintrc
#DL-URL: http://wiki.librecad.org/images/d/d9/Architect3-LCAD.zip
# Version is actually 8 (see http://wiki.librecad.org/index.php/File:Architect3-LCAD.zip)
Source1: Architect8-LCAD.zip
#DL-URL: http://wiki.librecad.org/images/7/70/Electronics3-LCAD.zip
# Version is actually 8 (see http://wiki.librecad.org/index.php/File:Electronics3-LCAD.zip)
Source2: Electronics8-LCAD.zip
Source3: ttf2lff.1
Source10: %name-rpmlintrc
Patch1: librecad-no-date.diff
Patch2: librecad-use-system-libdxfrw.patch
Patch3: librecad-install.diff
@@ -40,6 +46,7 @@ BuildRequires: gcc-c++ >= 4.7
BuildRequires: libdxfrw-devel
BuildRequires: libqt4-devel
BuildRequires: muparser-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: wqy-microhei-fonts
Requires(post): desktop-file-utils
@@ -67,7 +74,7 @@ Collection of parts for LibreCAD, a Qt4 application to design 2D
CAD drawings.
%prep
%setup -qn LibreCAD-%version
%setup -qn LibreCAD-%version -a 1 -a 2
%patch -P 1 -P 2 -P 3 -P 4 -p1
dxfrw_includedir=$(pkg-config --cflags-only-I libdxfrw0 | sed 's|-I||g')
@@ -79,6 +86,9 @@ sed -i 's|$${DXFRW_INCLUDEDIR}|'"$dxfrw_includedir"'|g' librecad/src/src.pro
# Make sure bundled libraries are not used
rm -rf libraries/libdxfrw
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
sed -i 's/\r$//' LICENSE-MIT.txt license-lc_opengost-fonts.txt
%build
qmake librecad.pro CONFIG+="release" QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags"
make %{?_smp_mflags}
@@ -93,6 +103,7 @@ export BUILDDIR="%buildroot/%_datadir/%name";
sh scripts/postprocess-unix.sh;
install -Dpm0755 "unix/%name" "$b/%_bindir/%name";
install -Dpm0644 "unix/appdata/%name.appdata.xml" "$b/%_datadir/appdata/%name.appdata.xml"
install -Dpm0755 "unix/ttf2lff" "$b/%_bindir/ttf2lff"
install -Dpm0644 "desktop/%name.1" "$b/%_mandir/man1/%name.1";
p="$b/%_libdir/%name/plugins";
@@ -101,7 +112,13 @@ install -Dpm0755 unix/resources/plugins/* "$p/";
install -Dpm0644 "desktop/%name.desktop" "$b/%_datadir/applications/%name.desktop";
install -Dpm0644 "librecad/res/main/%name.png" "$b/%_datadir/pixmaps/%name.png";
install -Dpm0644 "desktop/%name.sharedmimeinfo" "$b/%_datadir/mime/packages/%name.xml"
install -Dpm0644 %SOURCE1 "$b/%_mandir/man1/ttf2lff.1"
install -Dpm0644 %SOURCE3 "$b/%_mandir/man1/ttf2lff.1"
mkdir -p %buildroot%_datadir/%name/library/architecture
cp -a Architect8-LCAD %buildroot%_datadir/%name/library/architecture
mkdir -p %buildroot%_datadir/%name/library/electronics
cp -a Electronic8-LCAD %buildroot%_datadir/%name/library/electronics
%if 0%{?suse_version}
%suse_update_desktop_file -G "CAD Program" -r %name Graphics 2DGraphics VectorGraphics
@@ -121,12 +138,16 @@ perl -pi -e "s|image/vnd.dxf|image/vnd.dxf;|" %buildroot%_datadir/applications/l
%files
%defattr(-,root,root)
%doc LICENSE* README.md gpl-2.0*
%doc LICENSE* README.md gpl-2.0* license-lc_opengost-fonts.txt
%_bindir/librecad
%_bindir/ttf2lff
%_libdir/%name
%_mandir/man1/librecad.1*
%_mandir/man1/ttf2lff.1*
%if 0%{?suse_version} < 1320
%dir %_datadir/appdata/
%endif
%_datadir/appdata/%name.appdata.xml
%_datadir/applications/librecad.desktop
%_datadir/mime/packages/%name.xml
%_datadir/pixmaps/librecad.png