Hello community, here is the log from the commit of package librecad for openSUSE:Factory checked in at 2014-05-20 14:22:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librecad (Old) and /work/SRC/openSUSE:Factory/.librecad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librecad" Changes: -------- --- /work/SRC/openSUSE:Factory/librecad/librecad.changes 2013-07-01 15:55:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librecad.new/librecad.changes 2014-05-20 14:22:54.000000000 +0200 @@ -1,0 +2,54 @@ +Sun May 4 19:21:39 UTC 2014 - asterios.dra...@gmail.com + +- Update to new upstream release 2.0.2: + * Some notable changes visible to users: + + Reworked snapping system to allow simultaneous multiple snapping options; + snapping of equidistant middle points; + + Helping/scratch layer support. Straight lines are kept infinite and + entities are skipped in printout; + + Isometric grids; + + Architectural tick; + + Support of new ellipse features missing in version 1.0, such as, + intersection, middle point, arc length, and tangential direction; + + Several new drawing features for line, circle, and ellipse; + + Improved localization, translation for plugins and standard dialogs; + + Support for a general factor for drawing size dimensions to help scaled + drawings; + + Revert entities direction, developed by effad; + + Some UI tweaking; + + Windows setup registration to add LC in Windows Control Panel ‘Programs + and Features’. + * LibreCAD-2.0 is using a new dxfrw library to handle the DXF file format, + and some advantage of the dxfrw library brings are: + + New dxf library supporting ascii and binary files, more versions and + fully compatible with the specification; + + Support of templates; + + Dimensions: support for aligned / horizontal text; + + Dimensions: added general scale property; + + Added support for single line text. + * Some internal changes since LibreCAD-1.0 series: + + Removed Qt3 dependency; + + Reworked methods to calculate intersections to simplify support for new + entity types; + + Improved many drawing algorithms for performance; + + Added scripts to allow automatic building on OS/X and Windows; + + Added boost and C++11 support ; + + Various code review and bug fixes. + * See http://blog.librecad.org/ for more details. +- Updated License to GPL-2.0 and (Apache-2.0 or + SUSE-GPL-3.0+-with-font-exception). +- Added a man page (ttf2lff.1) for the ttf2lff program. +- Removed bash, dxflib-devel and libqt4-devel-doc build requirements (not + needed anymore). +- Added new build requirements boost-devel, libdxfrw-devel and + wqy-microhei-fonts. +- Added mime_database_post/mime_database_postun entries sice the package + installs a mime file. +- Rebased librecad-no-date.diff to apply cleanly. +- Removed the following patches (not needed anymore): + * librecad-dxflib25.diff + * librecad-external-dxflib.diff +- Added the following patches (taken from Fedora): + * librecad-use-system-libdxfrw.patch (Use system libdxfrw) + +------------------------------------------------------------------- Old: ---- librecad-1.0.3.tar.gz librecad-dxflib25.diff librecad-external-dxflib.diff New: ---- LibreCAD-2.0.2.tar.gz librecad-use-system-libdxfrw.patch ttf2lff.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librecad.spec ++++++ --- /var/tmp/diff_new_pack.PKfB5J/_old 2014-05-20 14:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.PKfB5J/_new 2014-05-20 14:22:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package librecad # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,33 +17,35 @@ Name: librecad -Version: 1.0.3 +Version: 2.0.2 Release: 0 Summary: Computer-aided design (CAD) software package for 2D design and drafting -License: GPL-2.0 +License: GPL-2.0 and (Apache-2.0 or SUSE-GPL-3.0+-with-font-exception) Group: Productivity/Graphics/CAD Url: http://librecad.org/ #Git-Clone: git://github.com/LibreCAD/LibreCAD #Git-Web: http://github.com/LibreCAD/LibreCAD/tags -#DL-URL: http://github.com/LibreCAD/LibreCAD/archive/v1.0.3/librecad-1.0.3.tar.gz -Source: %name-%version.tar.gz +#DL-URL: https://github.com/LibreCAD/LibreCAD/archive/2.0.3.tar.gz +Source0: LibreCAD-%version.tar.gz +Source1: ttf2lff.1 Source2: %name-rpmlintrc Patch1: librecad-no-date.diff -Patch2: librecad-dxflib25.diff -Patch3: librecad-external-dxflib.diff -Patch4: librecad-install.diff -Patch5: librecad-plugindir.diff -BuildRequires: bash -BuildRequires: dxflib-devel +Patch2: librecad-use-system-libdxfrw.patch +Patch3: librecad-install.diff +Patch4: librecad-plugindir.diff +BuildRequires: boost-devel BuildRequires: fdupes -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ >= 4.7 +BuildRequires: libdxfrw-devel BuildRequires: libqt4-devel -BuildRequires: libqt4-devel-doc BuildRequires: muparser-devel BuildRequires: update-desktop-files +BuildRequires: wqy-microhei-fonts Requires(post): desktop-file-utils +Requires(post): shared-mime-info Requires(postun): desktop-file-utils +Requires(postun): shared-mime-info Recommends: %name-parts # old qcad had a newer version, so we provide all versions here. Provides: qcad @@ -66,31 +68,40 @@ %prep %setup -qn LibreCAD-%version -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 + +dxfrw_includedir=$(pkg-config --cflags-only-I libdxfrw0 | sed 's|-I||g') + +# Fix paths +sed -i 's|##LIBDIR##|%_libdir|g' librecad/src/lib/engine/rs_system.cpp +sed -i 's|$${DXFRW_INCLUDEDIR}|'"$dxfrw_includedir"'|g' librecad/src/src.pro + +# Make sure bundled libraries are not used +rm -rf libraries/libdxfrw %build -# qmake seems to have an extra expansion step, so we need one more escape step. -f="%optflags -DCONFIG_LIBDIR=\\\\\\\"%_libdir\\\\\\\""; -qmake CONFIG+="release" QMAKE_CFLAGS+="$f" QMAKE_CXXFLAGS+="$f"; -make %{?_smp_mflags}; -pushd plugins/; -qmake CONFIG+="release" QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags"; -make %{?_smp_mflags}; -popd; +qmake librecad.pro CONFIG+="release" QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags" +make %{?_smp_mflags} +rm -f unix/resources/fonts/wqy-unicode.lff +mkdir -p unix/resources/fonts +./unix/ttf2lff -L "Apache-2.0 or SUSE-GPL-3.0+-with-font-exception" /usr/share/fonts/truetype/wqy-microhei.ttc unix/resources/fonts/wqy-unicode.lff %install b="%buildroot"; # No make install :( export BUILDDIR="%buildroot/%_datadir/%name"; -bash scripts/postprocess-unix.sh; +sh scripts/postprocess-unix.sh; install -Dpm0755 "unix/%name" "$b/%_bindir/%name"; -install -Dpm0644 desktop/%name.1 "$b/%_mandir/man1/%name.1"; +install -Dpm0755 "unix/ttf2lff" "$b/%_bindir/ttf2lff" +install -Dpm0644 "desktop/%name.1" "$b/%_mandir/man1/%name.1"; p="$b/%_libdir/%name/plugins"; mkdir -p "$p"; install -Dpm0755 unix/resources/plugins/* "$p/"; install -Dpm0644 "desktop/%name.desktop" "$b/%_datadir/applications/%name.desktop"; -install -Dpm0644 "res/main/%name.png" "$b/%_datadir/pixmaps/%name.png"; +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" %if 0%{?suse_version} %suse_update_desktop_file -G "CAD Program" -r %name Graphics 2DGraphics VectorGraphics @@ -98,21 +109,26 @@ # Fix rpmlint warning "invalid-desktopfile" perl -pi -e "s|image/vnd.dxf|image/vnd.dxf;|" %buildroot%_datadir/applications/librecad.desktop -%fdupes -s %buildroot +%fdupes -s %buildroot/%_prefix %post +%mime_database_post %desktop_database_post %postun +%mime_database_postun %desktop_database_postun %files %defattr(-,root,root) -%doc gpl-2.0.txt +%doc LICENSE* README.md gpl-2.0* %_bindir/librecad +%_bindir/ttf2lff %_libdir/%name %_mandir/man1/librecad.1* +%_mandir/man1/ttf2lff.1* %_datadir/applications/librecad.desktop +%_datadir/mime/packages/%name.xml %_datadir/pixmaps/librecad.png %dir %_datadir/%name %_datadir/%name/fonts ++++++ librecad-install.diff ++++++ --- /var/tmp/diff_new_pack.PKfB5J/_old 2014-05-20 14:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.PKfB5J/_new 2014-05-20 14:22:56.000000000 +0200 @@ -1,30 +1,30 @@ --- - librecad.pro | 1 - + librecad/src/src.pro | 1 - scripts/postprocess-unix.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -Index: LibreCAD-LibreCAD-a5c34b2/librecad.pro +Index: LibreCAD-2.0.2/librecad/src/src.pro =================================================================== ---- LibreCAD-LibreCAD-a5c34b2.orig/librecad.pro -+++ LibreCAD-LibreCAD-a5c34b2/librecad.pro -@@ -49,7 +49,6 @@ unix { - INCLUDEPATH += "/usr/include/muParser" - } - -- QMAKE_POST_LINK = scripts/postprocess-unix.sh +--- LibreCAD-2.0.2.orig/librecad/src/src.pro ++++ LibreCAD-2.0.2/librecad/src/src.pro +@@ -58,7 +58,6 @@ unix { + DEFINES += QC_APPDIR="\"librecad\"" + DEFINES += QINITIMAGES_LIBRECAD="qInitImages_librecad" + RC_FILE = ../res/main/librecad.icns +- QMAKE_POST_LINK = cd $$_PRO_FILE_PWD_/../.. && scripts/postprocess-unix.sh } } - win32 { -Index: LibreCAD-LibreCAD-a5c34b2/scripts/postprocess-unix.sh + win32 { +Index: LibreCAD-2.0.2/scripts/postprocess-unix.sh =================================================================== ---- LibreCAD-LibreCAD-a5c34b2.orig/scripts/postprocess-unix.sh -+++ LibreCAD-LibreCAD-a5c34b2/scripts/postprocess-unix.sh -@@ -1,7 +1,7 @@ - #!/bin/bash - +--- LibreCAD-2.0.2.orig/scripts/postprocess-unix.sh ++++ LibreCAD-2.0.2/scripts/postprocess-unix.sh +@@ -3,7 +3,7 @@ THISDIR="`pwd`" + LCDIR="${THISDIR}/librecad" + PIDIR="${THISDIR}/plugins" -RESOURCEDIR="${THISDIR}/unix/resources" +RESOURCEDIR=$BUILDDIR - TSDIR="${THISDIR}/ts" - DOCDIR="${THISDIR}/support/doc" - + TSDIRLC="${LCDIR}/ts" + TSDIRPI="${PIDIR}/ts" + SPTDIR="${LCDIR}/support" ++++++ librecad-no-date.diff ++++++ --- /var/tmp/diff_new_pack.PKfB5J/_old 2014-05-20 14:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.PKfB5J/_new 2014-05-20 14:22:56.000000000 +0200 @@ -1,15 +1,11 @@ ---- - src/main/qc_applicationwindow.cpp | 1 - - 1 file changed, 1 deletion(-) +Remove build time references so build-compare can do its work -Index: LibreCAD-LibreCAD-a5c34b2/src/main/qc_applicationwindow.cpp -=================================================================== ---- LibreCAD-LibreCAD-a5c34b2.orig/src/main/qc_applicationwindow.cpp -+++ LibreCAD-LibreCAD-a5c34b2/src/main/qc_applicationwindow.cpp -@@ -2966,7 +2966,6 @@ void QC_ApplicationWindow::slotHelpAbout - #ifdef QC_SCMREVISION - tr("SCM Revision: %1").arg(XSTR(QC_SCMREVISION)) + "<br>" + +--- LibreCAD-2.0.2/librecad/src/main/qc_applicationwindow.cpp.orig 2014-01-09 20:31:10.000000000 +0200 ++++ LibreCAD-2.0.2/librecad/src/main/qc_applicationwindow.cpp 2014-04-20 20:09:25.808375807 +0300 +@@ -3851,7 +3851,6 @@ + tr("Compiler: Microsoft Visual C++<br>") + #endif + tr("Qt Version: %1").arg(qVersion()) + "<br>" + - tr("Compiled on: %1").arg(__DATE__) + "<br>" + "Portions (c) 2011 by R. van Twisk" + "<br>" + tr("Program Icons Supplied by") +"<br> Pablo: LibreCAD Argentine<br/>" + ++++++ librecad-plugindir.diff ++++++ --- /var/tmp/diff_new_pack.PKfB5J/_old 2014-05-20 14:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.PKfB5J/_new 2014-05-20 14:22:56.000000000 +0200 @@ -1,21 +1,24 @@ From: Jan Engelhardt <jeng...@inai.de> Date: 2012-05-11 08:16:47.544680812 +0200 +Upstream: depending on whether it is considered an upstream bug or + not, it should be sent Look in the right spot for plugins. --- - src/lib/engine/rs_system.cpp | 2 ++ + librecad/src/lib/engine/rs_system.cpp | 2 ++ 1 file changed, 2 insertions(+) -Index: LibreCAD-LibreCAD-a5c34b2/src/lib/engine/rs_system.cpp +Index: LibreCAD-2.0.2/librecad/src/lib/engine/rs_system.cpp =================================================================== ---- LibreCAD-LibreCAD-a5c34b2.orig/src/lib/engine/rs_system.cpp -+++ LibreCAD-LibreCAD-a5c34b2/src/lib/engine/rs_system.cpp -@@ -548,6 +548,8 @@ QStringList RS_System::getDirectoryList( +--- LibreCAD-2.0.2.orig/librecad/src/lib/engine/rs_system.cpp ++++ LibreCAD-2.0.2/librecad/src/lib/engine/rs_system.cpp +@@ -642,6 +642,9 @@ QStringList RS_System::getDirectoryList( } RS_SETTINGS->endGroup(); -+ dirList.append(CONFIG_LIBDIR "/" + appDirName + "/" + subDirectory); ++ if (subDirectory == "plugins") ++ dirList.append("##LIBDIR##" + appDirName + "/" + subDirectory); + QStringList ret; ++++++ librecad-use-system-libdxfrw.patch ++++++ build: avoid using bundled libdxfrw [asterios.dra...@gmail.com: patch imported from Fedora] --- libraries/libraries.pro | 1 - librecad/src/src.pro | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) Index: LibreCAD-2.0.2/libraries/libraries.pro =================================================================== --- LibreCAD-2.0.2.orig/libraries/libraries.pro +++ LibreCAD-2.0.2/libraries/libraries.pro @@ -9,7 +9,6 @@ TEMPLATE = subdirs TARGET = libraries SUBDIRS = \ - libdxfrw \ jwwlib Index: LibreCAD-2.0.2/librecad/src/src.pro =================================================================== --- LibreCAD-2.0.2.orig/librecad/src/src.pro +++ LibreCAD-2.0.2/librecad/src/src.pro @@ -37,7 +37,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) { CONFIG += help } -PRE_TARGETDEPS += ../../generated/lib/libdxfrw.a PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a DESTDIR = $${INSTALLDIR} @@ -77,7 +76,7 @@ LIBS += -L../../generated/lib \ -ljwwlib DEPENDPATH += \ - ../../libraries/libdxfrw/src \ + $${DXFRW_INCLUDEDIR} \ ../../libraries/jwwlib/src \ cmd \ lib/actions \ ++++++ ttf2lff.1 ++++++ .TH TTF2LFF 1 "July 2012" "Debian GNU/Linux" .SH NAME ttf2lff \- ttf to lff converter. .SH DESCRIPTION ttf2lff is a font converter. It convert fonts in ttf format to lff format usseful to use with LibreCAD or another app that uses this format. ttf2lff invocation parameters are printed to the console if ttf2lff is called without parameters. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
