[megasync] Correct Qt5 BR.
by Vasiliy Glazov
commit 9515cd053f91ad8ac9e5efc930d5ccbb6baa10f8
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Fri May 3 07:59:04 2019 +0300
Correct Qt5 BR.
megasync.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/megasync.spec b/megasync.spec
index 1d788ed..dbf8431 100644
--- a/megasync.spec
+++ b/megasync.spec
@@ -31,7 +31,7 @@ BuildRequires: libmediainfo-devel
BuildRequires: c-ares-devel
BuildRequires: cryptopp-devel >= 5.6.5
BuildRequires: desktop-file-utils
-BuildRequires: qt5-qtbase-devel >= 5.6
+BuildRequires: qt5-qtbase-private-devel >= 5.6
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: terminus-fonts
5 years, 6 months
[megasync/f28] Initial commit.
by Vasiliy Glazov
Summary of changes:
dfb27c2... Initial commit. (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months
[megasync/f29] Initial commit.
by Vasiliy Glazov
Summary of changes:
dfb27c2... Initial commit. (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months
[megasync/f30] Initial commit.
by Vasiliy Glazov
Summary of changes:
dfb27c2... Initial commit. (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months
[vcmi] Boost 1.69 fixes, exclude ppc64le
by Miro Hrončok
commit b98c8122d349722ff82f3ee93e6478c3f05f758e
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Thu May 2 13:31:41 2019 +0200
Boost 1.69 fixes, exclude ppc64le
Co-authored-by: Jonathan Wakely <jwakely(a)redhat.com>
vcmi-boost-1.69.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
vcmi.spec | 9 ++++++++
2 files changed, 68 insertions(+)
---
diff --git a/vcmi-boost-1.69.patch b/vcmi-boost-1.69.patch
new file mode 100644
index 0000000..b689599
--- /dev/null
+++ b/vcmi-boost-1.69.patch
@@ -0,0 +1,59 @@
+diff --git a/AI/VCAI/AIUtility.cpp b/AI/VCAI/AIUtility.cpp
+index 3ca20b0..d884fa6 100644
+--- a/AI/VCAI/AIUtility.cpp
++++ b/AI/VCAI/AIUtility.cpp
+@@ -179,7 +179,7 @@ std::string strFromInt3(int3 pos)
+ return oss.str();
+ }
+
+-bool CDistanceSorter::operator ()(const CGObjectInstance *lhs, const CGObjectInstance *rhs)
++bool CDistanceSorter::operator ()(const CGObjectInstance *lhs, const CGObjectInstance *rhs) const
+ {
+ const CGPathNode *ln = ai->myCb->getPathsInfo(hero)->getPathInfo(lhs->visitablePos()),
+ *rn = ai->myCb->getPathsInfo(hero)->getPathInfo(rhs->visitablePos());
+diff --git a/AI/VCAI/AIUtility.h b/AI/VCAI/AIUtility.h
+index bbe96f8..8fcc0a2 100644
+--- a/AI/VCAI/AIUtility.h
++++ b/AI/VCAI/AIUtility.h
+@@ -167,5 +167,5 @@ class CDistanceSorter
+ public:
+ CDistanceSorter(const CGHeroInstance * hero): hero(hero) {}
+
+- bool operator ()(const CGObjectInstance *lhs, const CGObjectInstance *rhs);
++ bool operator ()(const CGObjectInstance *lhs, const CGObjectInstance *rhs) const;
+ };
+diff --git a/client/windows/CAdvmapInterface.cpp b/client/windows/CAdvmapInterface.cpp
+index d14e3a8..d096854 100644
+--- a/client/windows/CAdvmapInterface.cpp
++++ b/client/windows/CAdvmapInterface.cpp
+@@ -781,7 +781,7 @@ void CAdvMapInt::updateMoveHero(const CGHeroInstance *h, tribool hasPath)
+ if(boost::logic::indeterminate(hasPath))
+ hasPath = LOCPLINT->paths[h].nodes.size() ? true : false;
+
+- moveHero->block(!hasPath || (h->movement == 0));
++ moveHero->block(bool(!hasPath) || (h->movement == 0));
+ }
+
+ void CAdvMapInt::updateSpellbook(const CGHeroInstance *h)
+diff --git a/lib/CBattleCallback.cpp b/lib/CBattleCallback.cpp
+index 334bca2..3dcb8a7 100644
+--- a/lib/CBattleCallback.cpp
++++ b/lib/CBattleCallback.cpp
+@@ -499,7 +499,7 @@ bool CBattleInfoEssentials::battleMatchOwner(const CStack * attacker, const CSta
+ else if(defender->owner != battleGetOwner(defender))
+ return true;//mind controlled unit is attackable for both sides
+ else
+- return (battleGetOwner(attacker) == battleGetOwner(defender)) == positivness;
++ return (battleGetOwner(attacker) == battleGetOwner(defender)) == (bool) positivness;
+ }
+
+ si8 CBattleInfoCallback::battleHasWallPenalty( const CStack * stack, BattleHex destHex ) const
+@@ -1359,7 +1359,7 @@ std::pair<const CStack *, BattleHex> CBattleInfoCallback::getNearestStack(const
+
+ std::vector<const CStack *> possibleStacks = battleGetStacksIf([=](const CStack * s)
+ {
+- return s->isValidTarget(false) && s != closest && (boost::logic::indeterminate(attackerOwned) || s->attackerOwned == attackerOwned);
++ return s->isValidTarget(false) && s != closest && bool(boost::logic::indeterminate(attackerOwned) || s->attackerOwned == attackerOwned);
+ });
+
+ for(const CStack * st : possibleStacks)
diff --git a/vcmi.spec b/vcmi.spec
index 26e8e06..623a541 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -18,6 +18,13 @@ Patch1: %{name}-boost-1.66.patch
Source2: %{name}.zip
Patch2: %{name}-mods.patch
+# Boost 1.69 failures
+# tribool casts + https://github.com/vcmi/vcmi/commit/edcaaf036acb76882df2274f4df2aeef3c84525e
+Patch3: %{name}-boost-1.69.patch
+
+# The Koji builder gets killed here, but I don't expect people to use this there
+ExcludeArch: ppc64le
+
BuildRequires: %{_bindir}/desktop-file-validate
BuildRequires: %{_bindir}/dos2unix
BuildRequires: cmake
@@ -71,6 +78,8 @@ Data files for the VCMI project, a %{summary}.
mv vcmi/Mods/* Mods && rm -rf vcmi
%patch2 -p1
+%patch3 -p1
+
dos2unix README.md README.linux license.txt AUTHORS ChangeLog
5 years, 6 months
[performous] Add buildrequires openssl-devel
by Leigh Scott
commit 2ca51ea07bb3e8d78b67958fc4abbb8dd25b0f79
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu May 2 20:07:48 2019 +0100
Add buildrequires openssl-devel
performous.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/performous.spec b/performous.spec
index 223245d..507ca21 100644
--- a/performous.spec
+++ b/performous.spec
@@ -4,7 +4,7 @@
Name: performous
Version: 1.2
-Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist}
+Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist}
Summary: Free cross-platform music and rhythm / party game
# The main code is GPLv2+, and there are fonts under ASL 2.0 and SIL licenses
@@ -42,6 +42,7 @@ BuildRequires: libxml++-devel
BuildRequires: libraw1394-devel
BuildRequires: libtheora-devel
BuildRequires: opencv-devel
+BuildRequires: openssl-devel
BuildRequires: pango-devel
BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
@@ -123,6 +124,9 @@ rm -rf %buildroot%{_libdir}/*.{a,la}
%changelog
+* Thu May 02 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2-0.2.20190419git4ed8ec7
+- Add buildrequires openssl-devel
+
* Thu May 02 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2-0.1.20190419git4ed8ec7
- Update to latest git snapshot
- Short out the horrible buildrequires mess
5 years, 6 months
[performous] Update to latest git snapshot
by Leigh Scott
commit b89497ebcdf392307a1c5d8e83ad180c62196b18
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu May 2 19:26:14 2019 +0100
Update to latest git snapshot
.gitignore | 2 ++
performous.spec | 85 +++++++++++++++++++++++++++++++++++++--------------------
sources | 3 +-
3 files changed, 59 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bac89b4..ce91cba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/performous-1.1.tar.gz
+/ced-9d2d658.tar.gz
+/performous-4ed8ec7.tar.gz
diff --git a/performous.spec b/performous.spec
index 82fee3c..223245d 100644
--- a/performous.spec
+++ b/performous.spec
@@ -1,30 +1,53 @@
+%global commit0 4ed8ec78452a5c9e1aad55915378f301a4aa4bca
+%global gitdate 20190419
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
Name: performous
-Version: 1.1
-Release: 4%{?dist}
+Version: 1.2
+Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist}
Summary: Free cross-platform music and rhythm / party game
# The main code is GPLv2+, and there are fonts under ASL 2.0 and SIL licenses
License: GPLv2+ and ASL 2.0 and OFL
URL: http://performous.org
-Source0: https://github.com/performous/performous/archive/%{version}/%{name}-%{ver...
-Source1: https://raw.githubusercontent.com/performous/performous/master/licence.txt
-Source2: performous.appdata.xml
-
-BuildRequires: gcc-c++, cmake, cairo-devel, SDL2-devel
-BuildRequires: boost-devel, boost-system, boost-filesystem
-BuildRequires: librsvg2-devel, libxml2-devel, alsa-lib-devel
-BuildRequires: recode, glew-devel, help2man, libvorbis-devel
-BuildRequires: libsigc++20-devel, glibmm24-devel, libxml++-devel
-BuildRequires: ImageMagick-devel, ImageMagick-c++-devel
-BuildRequires: ffmpeg-devel, libraw1394-devel, libtheora-devel
-BuildRequires: pango-devel, portaudio-devel, gettext
-BuildRequires: opencv-devel, portmidi-devel
-BuildRequires: libepoxy-devel
+Source0: https://github.com/performous/performous/archive/%{commit0}/%{name}-%{sho...
+Source1: https://github.com/performous/compact_enc_det/archive/9d2d658/ced-9d2d658...
+Source2: https://raw.githubusercontent.com/performous/performous/master/licence.txt
+Source3: performous.appdata.xml
+
+BuildRequires: alsa-lib-devel
+BuildRequires: boost-devel
+BuildRequires: boost-system
+BuildRequires: boost-filesystem
+BuildRequires: cmake3
+BuildRequires: cairo-devel
+BuildRequires: cpprest-devel
BuildRequires: desktop-file-utils
+BuildRequires: ffmpeg-devel
+BuildRequires: glew-devel
+BuildRequires: gcc-c++
+BuildRequires: gettext
+BuildRequires: glibmm24-devel
+BuildRequires: glm-devel
+BuildRequires: help2man
+BuildRequires: ImageMagick-devel
+BuildRequires: ImageMagick-c++-devel
+BuildRequires: libepoxy-devel
BuildRequires: libappstream-glib
+BuildRequires: libvorbis-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: librsvg2-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxml++-devel
+BuildRequires: libraw1394-devel
+BuildRequires: libtheora-devel
+BuildRequires: opencv-devel
+BuildRequires: pango-devel
+BuildRequires: portaudio-devel
+BuildRequires: portmidi-devel
+BuildRequires: recode
+BuildRequires: SDL2-devel
-Obsoletes: ultrastar-ng <= 0.3.0
-Provides: ultrastar-ng = %{version}
Requires: %{name}-data = %{version}-%{release}
%description
@@ -45,13 +68,10 @@ package.
%prep
-%autosetup
-cp -p %{SOURCE1} .
+%autosetup -n %{name}-%{commit0}
+tar -xf %{SOURCE1} -C ced/ --strip 1
+cp -p %{SOURCE2} .
cp -p "docs/license/SIL OFL Font License New Rocker.txt" SIL-OFL.txt
-# Incorrect FSF address
-# https://github.com/performous/performous/issues/328
-sed -i -e 's/59 Temple Place, Suite 330, Boston, MA 02111-1307/51 Franklin St, Fifth Floor, Boston, MA 02110-1301/g' \
- tools/gh_fsb/*.{c,h}
%build
@@ -60,7 +80,7 @@ cd build
# Jack support is disabled because the engine can't be chosen at run-time and
# jack will always take precedence over pulseaudio
#%%cmake -DSHARE_INSTALL:PATH=share/performous \
-%cmake -DSHARE_INSTALL:PATH=%{_datadir}/performous \
+%cmake3 -DSHARE_INSTALL:PATH=%{_datadir}/performous \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
..
%make_build
@@ -71,14 +91,14 @@ cd build
%make_install
## Menu
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+mkdir -p %buildroot%{_datadir}/applications
+desktop-file-validate %buildroot%{_datadir}/applications/%{name}.desktop
## Appstream
-install -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/metainfo/%{name}.appdata.xml
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/%{name}.appdata.xml
+install -D -m 644 -p %{SOURCE3} %buildroot%{_datadir}/metainfo/%{name}.appdata.xml
+appstream-util validate-relax --nonet %buildroot%{_datadir}/metainfo/%{name}.appdata.xml
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
+rm -rf %buildroot%{_libdir}/*.{a,la}
%find_lang Performous
@@ -103,6 +123,11 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
%changelog
+* Thu May 02 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2-0.1.20190419git4ed8ec7
+- Update to latest git snapshot
+- Short out the horrible buildrequires mess
+- Don't fix fsf address, it isn't our job
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index d2d8351..50a287f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-cf31d0973cd88b3cd626d312d6d3f5b2 performous-1.1.tar.gz
+539a38986f659f27e5d7892980bc607c ced-9d2d658.tar.gz
+d4dafa65d611beb76e7d70994ec65baf performous-4ed8ec7.tar.gz
5 years, 6 months
