Accepting request 1249222 from graphics
OBS-URL: https://build.opensuse.org/request/show/1249222 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librecad?expand=0&rev=35
This commit is contained in:
Git OBS Bridge
commit
54800af9b5
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcb888a550f1f515ef6a2f7af2dd02605dd5c6da8a23f6c3a52479f8532ac109
|
||||
size 13645528
|
||||
@ -1,44 +0,0 @@
|
||||
build: avoid using bundled libdxfrw
|
||||
[asterios.dramis@gmail.com: imported the patch from Fedora into openSUSE's librecad]
|
||||
[jslaby@suse.com: rebase/rework on top of 2.1.0]
|
||||
|
||||
---
|
||||
libraries/libraries.pro | 1 -
|
||||
librecad/src/src.pro | 5 ++---
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: LibreCAD-2.2.0.2/libraries/libraries.pro
|
||||
===================================================================
|
||||
--- LibreCAD-2.2.0.2.orig/libraries/libraries.pro
|
||||
+++ LibreCAD-2.2.0.2/libraries/libraries.pro
|
||||
@@ -9,7 +9,6 @@ TEMPLATE = subdirs
|
||||
TARGET = libraries
|
||||
|
||||
SUBDIRS = \
|
||||
- libdxfrw \
|
||||
jwwlib
|
||||
|
||||
macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){
|
||||
Index: LibreCAD-2.2.0.2/librecad/src/src.pro
|
||||
===================================================================
|
||||
--- LibreCAD-2.2.0.2.orig/librecad/src/src.pro
|
||||
+++ LibreCAD-2.2.0.2/librecad/src/src.pro
|
||||
@@ -33,8 +33,7 @@ CONFIG += c++11
|
||||
}
|
||||
|
||||
GEN_LIB_DIR = ../../generated/lib
|
||||
-PRE_TARGETDEPS += $$GEN_LIB_DIR/libdxfrw.a \
|
||||
- $$GEN_LIB_DIR/libjwwlib.a
|
||||
+PRE_TARGETDEPS += $$GEN_LIB_DIR/libjwwlib.a
|
||||
|
||||
DESTDIR = $${INSTALLDIR}
|
||||
|
||||
@@ -85,7 +84,7 @@ LIBS += -L../../generated/lib \
|
||||
-ljwwlib
|
||||
|
||||
INCLUDEPATH += \
|
||||
- ../../libraries/libdxfrw/src \
|
||||
+ $${DXFRW_INCLUDEDIR} \
|
||||
../../libraries/jwwlib/src \
|
||||
cmd \
|
||||
lib/actions \
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 28 08:39:22 UTC 2025 - Jiri Slaby <jslaby@suse.cz>
|
||||
|
||||
- Update to release 2.2.1.1:
|
||||
See: https://github.com/LibreCAD/LibreCAD/compare/2.2.0.2...v2.2.1.1
|
||||
- Drop librecad-use-system-libdxfrw.patch
|
||||
libdxfrw is abondoned. Use the internal one instead.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 4 07:00:05 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package librecad
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# 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.2.0.2
|
||||
Version: 2.2.1.1
|
||||
Release: 0
|
||||
Summary: Computer-aided design (CAD) software package for 2D design and drafting
|
||||
License: (Apache-2.0 OR SUSE-GPL-3.0+-with-font-exception) AND GPL-2.0-only
|
||||
@ -25,7 +25,7 @@ Group: Productivity/Graphics/CAD
|
||||
URL: http://librecad.org/
|
||||
|
||||
#Git-Web: https://github.com/LibreCAD/LibreCAD
|
||||
Source: https://github.com/LibreCAD/LibreCAD/archive/%version.tar.gz
|
||||
Source: https://github.com/LibreCAD/LibreCAD/archive/v%version.tar.gz
|
||||
# Version is actually 8, not 3 (it is 3 in the filename due to how MediaWiki
|
||||
# works -- see http://wiki.librecad.org/index.php/File:Architect3-LCAD.zip)
|
||||
Source2: https://wiki.librecad.org/images/d/d9/Architect3-LCAD.zip
|
||||
@ -34,7 +34,6 @@ Source4: https://wiki.librecad.org/images/9/9d/Electrical1-LCAD.zip
|
||||
Source10: ttf2lff.1
|
||||
Source20: %name-rpmlintrc
|
||||
Patch4: librecad-no-date.diff
|
||||
Patch5: librecad-use-system-libdxfrw.patch
|
||||
Patch6: librecad-install.diff
|
||||
Patch7: librecad-plugindir.diff
|
||||
BuildRequires: fdupes
|
||||
@ -51,11 +50,10 @@ BuildRequires: pkgconfig(Qt5Help)
|
||||
BuildRequires: pkgconfig(Qt5PrintSupport)
|
||||
BuildRequires: pkgconfig(Qt5Svg)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(libdxfrw) >= 1
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(post): shared-mime-info
|
||||
Requires(postun):desktop-file-utils
|
||||
Requires(postun):shared-mime-info
|
||||
Requires(postun): desktop-file-utils
|
||||
Requires(postun): shared-mime-info
|
||||
Recommends: %name-parts
|
||||
|
||||
%description
|
||||
@ -76,20 +74,6 @@ CAD drawings.
|
||||
%setup -qn LibreCAD-%version -a2 -a3 -a4
|
||||
%autopatch -p1
|
||||
|
||||
pc="libdxfrw"
|
||||
if ! pkg-config --exists "$pc"; then
|
||||
pc=libdxfrw0
|
||||
fi
|
||||
dxfrw_includedir=$(pkg-config --cflags-only-I "$pc" | 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
|
||||
sed -i 's@LRELEASE="lrelease"@LRELEASE="lrelease-qt5"@' scripts/postprocess-unix.sh
|
||||
|
||||
# Make sure bundled libraries are not used
|
||||
rm -rf libraries/libdxfrw
|
||||
|
||||
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
|
||||
sed -i 's/\r$//' licenses/{MIT,KST32B_v2,lc_opengost-fonts}.txt
|
||||
|
||||
|
||||
3
v2.2.1.1.tar.gz
Normal file
3
v2.2.1.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:29c2f6fca4e0018f1e99fe324a8e9177780c1b01c435c2950a2c52627a47fdbf
|
||||
size 18597136
|
||||
Loading…
x
Reference in New Issue
Block a user