forked from pool/fritzing
Accepting request 1153138 from Education
OBS-URL: https://build.opensuse.org/request/show/1153138 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fritzing?expand=0&rev=24
This commit is contained in:
Git OBS Bridge
commit
49cd3b96ad
43
0001-Use-system-libgit2.patch
Normal file
43
0001-Use-system-libgit2.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From 419701acf1ae9a6b6ca175e9e05585264f45b551 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
|
||||
Date: Sun, 22 May 2022 13:36:15 +0200
|
||||
Subject: [PATCH 1/2] Use system libgit2
|
||||
|
||||
---
|
||||
phoenix.pro | 2 +-
|
||||
src/version/partschecker.cpp | 5 +++--
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/phoenix.pro b/phoenix.pro
|
||||
index dab1ba21..2df1e6c0 100644
|
||||
--- a/phoenix.pro
|
||||
+++ b/phoenix.pro
|
||||
@@ -175,7 +175,7 @@ RC_FILE = fritzing.rc
|
||||
RESOURCES += phoenixresources.qrc
|
||||
|
||||
# Disable this if you have (and want) libgit2 dynamically
|
||||
-LIBGIT_STATIC = true
|
||||
+LIBGIT_STATIC = false
|
||||
include(pri/libgit2detect.pri)
|
||||
|
||||
include(pri/boostdetect.pri)
|
||||
diff --git a/src/version/partschecker.cpp b/src/version/partschecker.cpp
|
||||
index 581bd491..868c15f5 100644
|
||||
--- a/src/version/partschecker.cpp
|
||||
+++ b/src/version/partschecker.cpp
|
||||
@@ -117,9 +117,10 @@ bool PartsChecker::newPartsAvailable(const QString &repoPath, const QString & sh
|
||||
/**
|
||||
* Connect to the remote.
|
||||
*/
|
||||
+
|
||||
DebugDialog::debug(QString("remote %1").arg(git_remote_url(remote)));
|
||||
-#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR > 24)
|
||||
- error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
|
||||
+#if LIBGIT2_VER_MINOR > 24 || LIBGIT2_VER_MAJOR >= 1
|
||||
+ error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
|
||||
#elif LIBGIT2_VER_MINOR == 24
|
||||
error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL);
|
||||
#else
|
||||
--
|
||||
2.36.0
|
||||
|
||||
29
0002-Fix-appdata.xml-url-type.patch
Normal file
29
0002-Fix-appdata.xml-url-type.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 955f160e8924394db4f17553ada65e445285e86f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
|
||||
Date: Sun, 22 May 2022 13:47:38 +0200
|
||||
Subject: [PATCH 2/2] Fix appdata.xml url type
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Klaus Kämpf <kkaempf@gmail.com>
|
||||
---
|
||||
org.fritzing.Fritzing.appdata.xml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/org.fritzing.Fritzing.appdata.xml b/org.fritzing.Fritzing.appdata.xml
|
||||
index f0f2688f..7a6276db 100644
|
||||
--- a/org.fritzing.Fritzing.appdata.xml
|
||||
+++ b/org.fritzing.Fritzing.appdata.xml
|
||||
@@ -45,7 +45,7 @@
|
||||
<url type="bugtracker">https://github.com/fritzing/fritzing-app/issues</url>
|
||||
<url type="faq">https://fritzing.org/faq/</url>
|
||||
<url type="help">https://fritzing.org/learning/</url>
|
||||
- <url type="forum">https://forum.fritzing.org</url>
|
||||
+ <url type="contact">https://forum.fritzing.org</url>
|
||||
<!-- <url type="donation">https://fritzing.org/shop/donations/</url> -->
|
||||
<url type="translate">https://fritzing.org/support-us/language-translation/</url>
|
||||
<releases>
|
||||
--
|
||||
2.36.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b8af09b44a1d79fc3ff86f4e0c6793cd4473baf052420b7e1f127f0aaa968167
|
||||
size 11430102
|
||||
17
_service
Normal file
17
_service
Normal file
@ -0,0 +1,17 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="manual">
|
||||
<param name="url">https://github.com/fritzing/fritzing-app.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">0.9.9+git%cd.%h</param>
|
||||
<param name="revision">f0af53a</param>
|
||||
<param name="changesgenerate">disable</param>
|
||||
</service>
|
||||
<service name="recompress" mode="manual">
|
||||
<param name="file">fritzing-app-*.tar</param>
|
||||
<param name="compression">gz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="manual">
|
||||
<param name="basename">fritzing-app</param>
|
||||
</service>
|
||||
</services>
|
||||
3
fritzing-app-0.9.9+git20210922.f0af53a.tar.gz
Normal file
3
fritzing-app-0.9.9+git20210922.f0af53a.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0f1653d2639eccd9ac57b20c373399a207211198e60ca270c8ac55ccc1d240c5
|
||||
size 11671749
|
||||
@ -1,26 +0,0 @@
|
||||
diff -Nurd fritzing-app-CD-498/phoenix.pro fritzing-app-CD-498.new/phoenix.pro
|
||||
--- fritzing-app-CD-498/phoenix.pro 2019-12-01 14:05:45.000000000 +0100
|
||||
+++ fritzing-app-CD-498.new/phoenix.pro 2020-05-06 20:36:12.869380287 +0200
|
||||
@@ -166,7 +166,7 @@
|
||||
RESOURCES += phoenixresources.qrc
|
||||
|
||||
# Disable this if you have (and want) libgit2 dynamically
|
||||
-LIBGIT_STATIC = true
|
||||
+LIBGIT_STATIC = false
|
||||
include(pri/libgit2detect.pri)
|
||||
|
||||
include(pri/boostdetect.pri)
|
||||
diff -Nurd fritzing-app-CD-498/src/version/partschecker.cpp fritzing-app-CD-498.new/src/version/partschecker.cpp
|
||||
--- fritzing-app-CD-498/src/version/partschecker.cpp 2019-12-01 14:05:45.000000000 +0100
|
||||
+++ fritzing-app-CD-498.new/src/version/partschecker.cpp 2020-05-06 20:44:30.824507804 +0200
|
||||
@@ -115,8 +115,8 @@
|
||||
/**
|
||||
* Connect to the remote.
|
||||
*/
|
||||
-#if LIBGIT2_VER_MINOR > 24
|
||||
- error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
|
||||
+#if LIBGIT2_VER_MINOR > 24 || LIBGIT2_VER_MAJOR >= 1
|
||||
+ error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
|
||||
#elif LIBGIT2_VER_MINOR == 24
|
||||
error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL);
|
||||
#else
|
||||
@ -1,3 +1,49 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 29 06:18:42 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Fix package name typo in _service file.
|
||||
- Change deprecated "disabled" modes to "manual".
|
||||
- Disable automatic changes generation when running tar_scm
|
||||
service.
|
||||
- Freeze at commit f0af53a, drop full url for Source0, and
|
||||
regenerate tarball (note version changes: f0af53a9 -> f0af53a).
|
||||
- Clean up specfile, drop macros catering to ancient oS releases.
|
||||
- Drop _servicedata.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 26 08:46:46 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %autosetup macro. Allows to eliminate the usage of deprecated
|
||||
PatchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 22 11:51:41 UTC 2022 - Klaus Kämpf <kkaempf@suse.com>
|
||||
|
||||
- rename fritzing-use-system-libgit2.patch to 0001-Use-system-libgit2.patch
|
||||
- add 0002-Fix-appdata.xml-url-type.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 22 11:32:42 UTC 2022 - kkaempf@suse.com
|
||||
|
||||
- Update to version 0.9.9+git20210922.f0af53a9:
|
||||
* Fixed #3882 by fixing power label bus removal.
|
||||
* Add keyboard shortcut for rotating by 90 degree, horizontal flip and search
|
||||
* Do not add wires if they are too small, fixes #3731. Additionally, this commit fixes the color of the temporal wire that appears when creating a new bend point (the wire needs to not be blue to observe the bug)
|
||||
* resize a stripboard following the current layout, fixes #3090 #2998 and #3084. The slow performance is still present but the extended area is not shortcircuited.
|
||||
* Added Fritzing Fab links to recent file list in welcome view.
|
||||
* Bump version to 0.9.9
|
||||
* Merge develop
|
||||
* Remove .ts.orig file from merge conflict
|
||||
* Increased width of fabuploaddialog to fit translations.
|
||||
* Fix swapped url + title, projects could not be selected if language setting is not English
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 22 11:24:40 UTC 2022 - Klaus Kämpf <kkaempf@suse.com>
|
||||
|
||||
- Update to 0.9.6
|
||||
maintenance release, fixed at least ten crashes, several critical
|
||||
bugs, and about 30-100 regular bugs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 10 18:16:39 UTC 2020 - Thomas Zimmermann <bugs@vdm-design.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package fritzing
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,44 +16,33 @@
|
||||
#
|
||||
|
||||
|
||||
%define cdversion CD-498
|
||||
Name: fritzing
|
||||
Version: 0.9.4
|
||||
Version: 0.9.9+git20210922.f0af53a
|
||||
Release: 0
|
||||
Summary: Electronic Design Automation platform featuring prototype to product
|
||||
License: GPL-3.0-or-later
|
||||
Group: Productivity/Scientific/Electronics
|
||||
URL: http://fritzing.org/
|
||||
Source0: https://github.com/fritzing/fritzing-app/archive/%{cdversion}.tar.gz
|
||||
#PATCH-FIX-OPENSUSE fritzing-use-system-libgit2.patch -- use system libgit, upstream wants to use bundled version
|
||||
Patch0: fritzing-use-system-libgit2.patch
|
||||
%if 0%{?suse_version} > 1325
|
||||
BuildRequires: libboost_headers-devel
|
||||
%else
|
||||
BuildRequires: boost_1_58_0-devel
|
||||
%endif
|
||||
URL: https://fritzing.org/
|
||||
Source0: %{name}-app-%{version}.tar.gz
|
||||
#PATCH-FIX-OPENSUSE 0001-Use-system-libgit2.patch -- use system libgit, upstream wants to use bundled version
|
||||
Patch1: 0001-Use-system-libgit2.patch
|
||||
#PATCH-FIX-OPENSUSE 0002-Fix-appdata.xml-url-type.patch -- fix appdata url type
|
||||
Patch2: 0002-Fix-appdata.xml-url-type.patch
|
||||
BuildRequires: appstream-glib
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libboost_headers-devel
|
||||
BuildRequires: libgit2-devel >= 0.23
|
||||
BuildRequires: libqt5-qtbase-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: zlib-devel
|
||||
%if 0%{?suse_version} < 1320
|
||||
BuildRequires: libQt5SerialPort-devel
|
||||
BuildRequires: libQt5Svg-devel
|
||||
Requires: libqt5-sql-sqlite
|
||||
%else
|
||||
BuildRequires: libqt5-qtserialport-devel
|
||||
BuildRequires: libqt5-qtsvg-devel
|
||||
Requires: libQt5Sql5-sqlite
|
||||
%endif
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: zlib-devel
|
||||
Requires: fritzing-parts
|
||||
Requires(post): shared-mime-info
|
||||
Requires(postun): shared-mime-info
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
BuildRequires: appstream-glib
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: libQt5Sql5-sqlite
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(post): shared-mime-info
|
||||
Requires(postun): desktop-file-utils
|
||||
Requires(postun): shared-mime-info
|
||||
|
||||
%description
|
||||
Fritzing is an initiative to support designers, artists,
|
||||
@ -63,31 +52,28 @@ allow users to document their Arduino and other electronic-based
|
||||
prototypes, and to create a PCB layout for manufacturing.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-app-%{cdversion}
|
||||
%patch0 -p1
|
||||
%autosetup -p1 -n %{name}-app-%{version}
|
||||
|
||||
sed -i 's/\r$//' LICENSE.CC-BY-SA
|
||||
chmod -x LICENSE* README.md Fritzing.1
|
||||
|
||||
%build
|
||||
# QMAKE_CFLAGS_ISYSTEM= added to work around gcc6 build problems
|
||||
qmake-qt5 QMAKE_CFLAGS_ISYSTEM=
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
make INSTALL_ROOT=%{buildroot} install
|
||||
sed -i '/Categories=/d' org.fritzing.Fritzing.desktop
|
||||
%suse_update_desktop_file -i -r org.fritzing.Fritzing Development IDE
|
||||
find %{buildroot}%{_datadir}/%{name}/ -type f -exec chmod -x {} \;
|
||||
#rm -rf %{buildroot}%{_datadir}/%{name}/parts
|
||||
#rm -rf %%{buildroot}%%{_datadir}/%%{name}/parts
|
||||
%fdupes %{buildroot}%{_datadir}/%{name}/sketches
|
||||
appstream-util validate-relax --nonet org.fritzing.Fritzing.appdata.xml
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc README.md LICENSE.GPL2 LICENSE.GPL3 LICENSE.CC-BY-SA
|
||||
%license LICENSE.GPL2 LICENSE.GPL3 LICENSE.CC-BY-SA
|
||||
%doc README.md
|
||||
%{_bindir}/Fritzing
|
||||
%{_datadir}/%{name}/
|
||||
%{_datadir}/pixmaps/%{name}.png
|
||||
@ -96,12 +82,4 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/mime/packages/*.xml
|
||||
%{_datadir}/metainfo/org.fritzing.Fritzing.appdata.xml
|
||||
|
||||
%post
|
||||
%desktop_database_post
|
||||
%mime_database_post
|
||||
|
||||
%postun
|
||||
%desktop_database_postun
|
||||
%mime_database_postun
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user