rpms/merkaartor/F-9 merkaartor-noqgtkstyle.patch, NONE, 1.1 merkaartor.spec, 1.4, 1.5
Sven Lankes
slankes at fedoraproject.org
Tue Apr 28 22:08:59 UTC 2009
- Previous message (by thread): rpms/merkaartor/F-11 merkaartor-noqgtkstyle.patch, NONE, 1.1 merkaartor.spec, 1.11, 1.12
- Next message (by thread): rpms/sunbird/devel mozilla-jemalloc.patch, NONE, 1.1 sunbird-1.0-libical.patch, NONE, 1.1 sunbird-1.0-uilocale.patch, NONE, 1.1 thunderbird-pango.patch, NONE, 1.1 thunderbird-shared-error.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 sunbird.spec, 1.21, 1.22 sunbird-0.7-path.patch, 1.1, NONE sunbird-0.7-uilocale.patch, 1.1, NONE sunbird-0.9-libical.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: slankes
Update of /cvs/pkgs/rpms/merkaartor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27813/F-9
Modified Files:
merkaartor.spec
Added Files:
merkaartor-noqgtkstyle.patch
Log Message:
force non-qgtkstyle (work around bz #498111)
merkaartor-noqgtkstyle.patch:
--- NEW FILE merkaartor-noqgtkstyle.patch ---
--- Main.cpp.orig 2009-04-28 23:23:20.804816252 +0200
+++ Main.cpp 2009-04-28 23:23:32.628816670 +0200
@@ -9,6 +9,8 @@
int main(int argc, char** argv)
{
+ QApplication::setStyle("plastique");
+
QApplication app(argc,argv);
QCoreApplication::setOrganizationName("BartVanhauwaert");
Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/merkaartor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- merkaartor.spec 26 Apr 2009 19:45:40 -0000 1.4
+++ merkaartor.spec 28 Apr 2009 22:08:29 -0000 1.5
@@ -1,6 +1,6 @@
Name: merkaartor
Version: 0.13.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Qt-Based OpenStreetMap editor
Group: Applications/Productivity
@@ -9,6 +9,7 @@ URL: http://www.merkaartor.or
Source0: http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
# This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
Patch0: merkaartor-eslang.patch
+Patch1: merkaartor-noqgtkstyle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel >= 4.4
@@ -26,10 +27,11 @@ transparent display of map features like
%prep
%setup -q
%patch0 -p0
+%patch1 -p0
%build
lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
make %{?_smp_mflags}
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS CHANGELOG HACKING LICENSE
%changelog
+* Tue Apr 28 2009 Sven Lankes <sven at lank.es> - 0.13.2-2
+- disable use of qgtkstyle until gdal conflict (bz# 498111) is solved
+
* Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
- new upstream release
- Previous message (by thread): rpms/merkaartor/F-11 merkaartor-noqgtkstyle.patch, NONE, 1.1 merkaartor.spec, 1.11, 1.12
- Next message (by thread): rpms/sunbird/devel mozilla-jemalloc.patch, NONE, 1.1 sunbird-1.0-libical.patch, NONE, 1.1 sunbird-1.0-uilocale.patch, NONE, 1.1 thunderbird-pango.patch, NONE, 1.1 thunderbird-shared-error.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 sunbird.spec, 1.21, 1.22 sunbird-0.7-path.patch, 1.1, NONE sunbird-0.7-uilocale.patch, 1.1, NONE sunbird-0.9-libical.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list