public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Artur Frenszek-Iwicki <fedora@svgames.pl>
To: git-commits@fedoraproject.org
Subject: [rpms/fritzing] f44: Update to v1.0.8
Date: Mon, 24 Aug 2026 18:13:46 GMT	[thread overview]
Message-ID: <178759522653.1.6130685336602250890.rpms-fritzing-d4c0c3f67212@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/fritzing
Branch : f44
Commit : d4c0c3f672124ab7de39f66ec587e5584959bcbd
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date   : 2026-08-24T19:58:10+02:00
Stats  : +90/-9 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/fritzing/c/d4c0c3f672124ab7de39f66ec587e5584959bcbd?branch=f44

Log:
Update to v1.0.8

---
diff --git a/0005-gitversion.patch b/0005-gitversion.patch
new file mode 100644
index 0000000..db921ff
--- /dev/null
+++ b/0005-gitversion.patch
@@ -0,0 +1,45 @@
+--- fritzing-app-5aa56a510183c23084990a6b4481708cad24c15b/pri/gitversion.pri.orig	2026-07-28 09:36:38.000000000 +0200
++++ fritzing-app-5aa56a510183c23084990a6b4481708cad24c15b/pri/gitversion.pri	2026-08-22 21:35:21.740518761 +0200
+@@ -1,39 +1,3 @@
+-# Need to discard STDERR so get path to NULL device
+-win32 {
+-    NULL_DEVICE = NUL # Windows doesn't have /dev/null but has NUL
+-} else {
+-    NULL_DEVICE = /dev/null
+-}
+-
+-# Need to call git with manually specified paths to repository
+-BASE_GIT_COMMAND = git --git-dir $$PWD/../.git --work-tree $$PWD/..
+-
+-$$(CI) {
+-    # When running on travis ci, the tag is created *after* the build was successful.
+-    # So we can not use 'git describe', but we generate a string that should look exactly
+-    # like what git describe would deliver
+-    GIT_VERSION = CD-$$(TRAVIS_BUILD_NUMBER)-0-$$system($$BASE_GIT_COMMAND rev-parse --short HEAD)
+-} else {
+-    GIT_VERSION = $$system($$BASE_GIT_COMMAND describe --tags 2> $$NULL_DEVICE)
+-}
+-
+-GIT_DATE = $$system($$BASE_GIT_COMMAND show --no-patch --no-notes --pretty='%cd' HEAD --date=iso-strict 2> $$NULL_DEVICE)
+-
+-# Here we process the build date and time
+-win32 {
+-    # Try to squeeze something ISO-8601-ish out of windows
+-    BUILD_DATE = $$system( powershell (Get-Date -Format "o") )
+-}
+-
+-macx {
+-    # MacOS uses BSD date rather than GNU date. 
+-    BUILD_DATE = $$system( date +%Y-%m-%dT%H:%M:%S%z )
+-}
+-
+-!win32:!macx {
+-    BUILD_DATE = $$system( date --iso-8601=seconds )
+-}
+-
+-DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\"
+-DEFINES += GIT_DATE=\\\"$$GIT_DATE\\\"
+-DEFINES += BUILD_DATE=\\\"$$BUILD_DATE\\\"
++DEFINES += GIT_VERSION=\\\"$$(FEDORA_GIT_VERSION)\\\"
++DEFINES += GIT_DATE=\\\"$$(FEDORA_GIT_DATE)\\\"
++DEFINES += BUILD_DATE=\\\"$$(FEDORA_BUILD_DATE)\\\"

diff --git a/0006-hardware-platform.patch b/0006-hardware-platform.patch
new file mode 100644
index 0000000..d708e0c
--- /dev/null
+++ b/0006-hardware-platform.patch
@@ -0,0 +1,18 @@
+--- fritzing-app-5aa56a510183c23084990a6b4481708cad24c15b/phoenix.pro.orig	2026-07-28 09:36:38.000000000 +0200
++++ fritzing-app-5aa56a510183c23084990a6b4481708cad24c15b/phoenix.pro	2026-08-24 16:28:46.703968097 +0200
+@@ -96,14 +96,9 @@
+     QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
+ }
+ unix {
+     !macx { # unix is defined on mac
+-        HARDWARE_PLATFORM = $$system(uname -m)
+-        contains(HARDWARE_PLATFORM, x86_64)|contains(HARDWARE_PLATFORM, aarch64) {
+-            DEFINES += LINUX_64
+-        } else {
+-            DEFINES += LINUX_32
+-        }
++        DEFINES += $$(FEDORA_PLATFORM)
+         LIBS += -lz
+     }
+ 
+     isEmpty(PREFIX) {

diff --git a/fritzing.spec b/fritzing.spec
index a7960c9..93d23ef 100644
--- a/fritzing.spec
+++ b/fritzing.spec
@@ -5,17 +5,19 @@ Summary:        Electronic Design Automation software; from prototype to product
 License:        GPL-3.0-or-later
 URL:            https://fritzing.org/
 
-%global version_no 1.0.7
+%global version_no 1.0.8
 Release:        1%{?dist}
 
 # The upstream developer no longer marks their releases with git tags.
-# Take the latest commit from the "1.0.7" branch in the fritzing-app repo.
-%global app_date 20260414
-%global app_commit 394a8bb4791424ffd99f99ebc330264d4becea63
+# According to the website, v1.0.8 was released on 2026-08-12.
+# There are no git commits on the 'devel' branch made on that date.
+# Take the latest commit made before said date.
+%global app_date 20260728
+%global app_commit 5aa56a510183c23084990a6b4481708cad24c15b
 
-# Take the latest commit from the "1.0.7" branch in the fritzing-parts repo.
-%global parts_date 20260325
-%global parts_commit 70a1773402e8c76a77795637de482a83db3ca6d7
+# Take the latest commit made before 2026-08-12 from the fritzing-parts repo.
+%global parts_date 20260723
+%global parts_commit 27535f2fd02097be9bed229b75aa8e9be282a4a0
 
 # Include the commit date in the version numbers
 %global app_version %{version_no}^%{app_date}
@@ -35,6 +37,10 @@ Patch2:         0002-remove-twitter4j.patch
 Patch3:         0003-maximum-qt-version.patch
 # Fix missing required Qt library
 Patch4:         0004-qt6-core5compat.patch
+# The build system tries to take some version info from git - provide it manually
+Patch5:         0005-gitversion.patch
+# The build system performs some flawed 64-bit arch detection
+Patch6:         0006-hardware-platform.patch
 
 # Point library detection scripts to system-provided libs.
 Patch10:        0010-quazip-detect.patch
@@ -122,6 +128,15 @@ sed -e '/<url type="forum">/d' -i '%{rtld_name}.appdata.xml'
 
 
 %build
+export FEDORA_GIT_DATE="%{app_date}"
+export FEDORA_GIT_VERSION="$(c="%{app_commit}"; echo "${c:0:7}")"
+export FEDORA_BUILD_DATE="$(date --date="@${SOURCE_DATE_EPOCH}" --iso-8601=seconds )"
+%ifnarch %{ix86}
+export FEDORA_PLATFORM="LINUX_64"
+%else
+export FEDORA_PLATFORM="LINUX_32"
+%endif
+
 %qmake_qt6 PREFIX=%{_prefix}
 %make_build V=1
 
@@ -163,6 +178,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.0.8^20260728-1
+- Update to v1.0.8
+
 * Wed Jun 03 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.0.7^20260414-1
 - Update to v1.0.7
 - Drop Qt6-related patches (issues fixed upstream)

diff --git a/sources b/sources
index dd1b822..f31a41a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fritzing-app-394a8bb4791424ffd99f99ebc330264d4becea63.tar.gz) = 1c58daa6d561fbb4ea948cfa8d382ca4b6dd9d84c7857610cb008dbc9e7f20a668492f3d432a4dfa82eaddc016eff4611fcc54d4dc5eb4a35498b6fd3e4215be
-SHA512 (fritzing-parts-70a1773402e8c76a77795637de482a83db3ca6d7.tar.gz) = 51b6fc05db60287d5be10b0f228d73b982fc1883822985b4be8e037ccbf240369281ab4cf51b1ebb2c967d943284b25d12aea4e560c861c7c120914acf84fbde
+SHA512 (fritzing-app-5aa56a510183c23084990a6b4481708cad24c15b.tar.gz) = c72139033258dfc14373cc67b2edde0b266e0931dce4560eb733d3688d18f6a6d03fcc6d0e22823e541d95ccd3c92be6bd3bddfd255fe2d4dce149530cd9989d
+SHA512 (fritzing-parts-27535f2fd02097be9bed229b75aa8e9be282a4a0.tar.gz) = 7806a1c51c9e164c211006ff2cd2c3912f4305938907f7ff1a108a44e8dd6b5c24863548fb3d38940827a4d8d254ce20ac40a3a6de935a451614f1b46f5e4d6a

                 reply	other threads:[~2026-08-24 18:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178759522653.1.6130685336602250890.rpms-fritzing-d4c0c3f67212@fedoraproject.org \
    --to=fedora@svgames.pl \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox