Skip to content

Commit

Permalink
LPub3D continuous release_build skip_qemu
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorsandy committed Jun 23, 2023
1 parent baf4970 commit f2cbc7b
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion builds/linux/obs/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Last Update: July 19, 2020
# Copyright (C) 2017 - 2023 by Trevor SANDY
pkgname=lpub3d
pkgver=2.4.7.3480
pkgver=2.4.7.3481
pkgrel=1
pkgdesc="An LDraw Building Instruction Editor"
url="https://github.com/trevorsandy/lpub3d.git"
Expand Down
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Last Update: July 19, 2020
# Copyright (C) 2017 - 2023 by Trevor SANDY
pkgname=lpub3d
pkgver=2.4.7.3480
pkgver=2.4.7.3481
pkgrel=1
pkgdesc="An LDraw Building Instruction Editor"
url="https://github.com/trevorsandy/lpub3d.git"
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/alldeps/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lpub3d (2.4.7.3480) debian; urgency=medium
lpub3d (2.4.7.3481) debian; urgency=medium

* LPub3D version 2.4.7.4.3480_20230623 for Linux
* LPub3D version 2.4.7.5.3481_20230623 for Linux

-- Trevor SANDY <trevor.sandy@gmail.com> Fri, 23 Jun 2023 16:25:37 +0200
-- Trevor SANDY <trevor.sandy@gmail.com> Fri, 23 Jun 2023 16:27:44 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 1.0
Source: lpub3d
Binary: lpub3d
Architecture: any
Version: 2.4.7.3480
Version: 2.4.7.3481
Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/alldeps/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ BuildRequires: fdupes
Summary: An LDraw Building Instruction Editor
Name: lpub3d
Icon: lpub3d.xpm
Version: 2.4.7.3480
Version: 2.4.7.3481
Release: <B_CNT>%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -797,7 +797,7 @@ update-desktop-database || true
%endif

%changelog
* Fri Jun 23 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3480
* Fri Jun 23 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3481
- LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details

* Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lpub3d (2.4.7.3480) debian; urgency=medium
lpub3d (2.4.7.3481) debian; urgency=medium

* LPub3D version 2.4.7.4.3480_20230623 for Linux
* LPub3D version 2.4.7.5.3481_20230623 for Linux

-- Trevor SANDY <trevor.sandy@gmail.com> Fri, 23 Jun 2023 16:25:39 +0200
-- Trevor SANDY <trevor.sandy@gmail.com> Fri, 23 Jun 2023 16:27:45 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 1.0
Source: lpub3d
Binary: lpub3d
Architecture: any
Version: 2.4.7.3480
Version: 2.4.7.3481
Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ BuildRequires: fdupes
Summary: An LDraw Building Instruction Editor
Name: lpub3d
Icon: lpub3d.xpm
Version: 2.4.7.3480
Version: 2.4.7.3481
Release: 1%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -313,7 +313,7 @@ update-desktop-database || true
%endif

%changelog
* Fri Jun 23 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3480
* Fri Jun 23 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3481
- LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details

* Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670
Expand Down
2 changes: 1 addition & 1 deletion builds/utilities/version.info
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2 4 7 4 3480 64f1cc4e0
2 4 7 5 3481 baf49705c
6 changes: 3 additions & 3 deletions gitversion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) {

# Check if we do not have a valid version number (i.e. no version tag found)
isEmpty(GIT_VERSION) {
GIT_REVISION = 4
GIT_REVISION = 5
GIT_SHA = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE)
GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
GIT_VERSION = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA}
Expand Down Expand Up @@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) {
# Get commit count
GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
isEmpty(GIT_COMMIT) {
GIT_COMMIT = 3480
GIT_COMMIT = 3481
message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
}

Expand Down Expand Up @@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) {
GIT_VERSION = $$cat($$GIT_VER_FILE, lines)
} else {
message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~")
GIT_VERSION = $${VERSION}.4.3480.64f1cc4e0
GIT_VERSION = $${VERSION}.5.3481.baf49705c
message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
GIT_VERSION ~= s/\./" "
}
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LPub3D 2.4.7.4.3480 (23 06 2023 16:25:39)
LPub3D 2.4.7.5.3481 (23 06 2023 16:27:45)

Features, enhancements, fixes and changes
------------
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/RELEASE_NOTES.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<table class="tg">
<tr>
<th class="tg-0pky">
<h4><a id="LPub3D_0"></a>LPub3D 2.4.7.4.3480 (23 06 2023 16:25:39)</h4>
<h4><a id="LPub3D_0"></a>LPub3D 2.4.7.5.3481 (23 06 2023 16:27:45)</h4>
<hr>
<p>
<span class="tg-1pky">LPub3D Official release.</span><br>
Expand Down
4 changes: 2 additions & 2 deletions mainApp/extras/LPub3D_Npp_UDL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
;;
;; Author......: Trevor SANDY
;; Name........: LPub3D_Npp_UDL.xml
;; Version.....: 2.4.7.4.3480
;; Last Update.: Fri, 23 Jun 2023 16:25:39 +0200
;; Version.....: 2.4.7.5.3481
;; Last Update.: Fri, 23 Jun 2023 16:27:45 +0200
;; License.....: GPLv3
;; Homepage....: https://trevorsandy.github.io/lpub3d
;; Copyright (C) 2021 - 2023 by Trevor SANDY
Expand Down
4 changes: 2 additions & 2 deletions mainApp/lpub3d.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<binary>lpub3d24</binary>
​</provides>
<releases>
<release version="2.4.7.3480" date="2023-06-23">
<release version="2.4.7.3481" date="2023-06-23">
<description>
<p>LPub3D 23.06.2023 v2.4.7 r4 Continuous Build
<p>LPub3D 23.06.2023 v2.4.7 r5 Continuous Build
- Fix - Abnormal rendering behaviour #726
- Fix - Add LDView Assembly Rendered Arguments conflated #727
See https://github.com/trevorsandy/lpub3d/releases/download/continuous/release_notes.html
Expand Down
4 changes: 2 additions & 2 deletions mainApp/render.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1977,9 +1977,9 @@ int LDView::renderCsi(
}

// additional LDView parameters;
if (ldviewParmsArgs.size()){
if (ldviewParmsArgs.size()) {
emit gui->messageSig(LOG_INFO,QObject::tr("LDView additional CSI renderer parameters: %1")
.arg(ldviewParmsArgs.join(" ")));
.arg(ldviewParmsArgs.join(" ")));
cg.append(QString(" %1").arg(ldviewParmsArgs.join(" ")));
}
};
Expand Down

0 comments on commit f2cbc7b

Please sign in to comment.