rpms/ipe/devel ipe_6.0pre26-qmake-defines.patch, NONE, 1.1 ipe.spec, 1.5, 1.6
Laurent Rineau (rineau)
fedora-extras-commits at redhat.com
Fri Sep 1 12:34:48 UTC 2006
Author: rineau
Update of /cvs/extras/rpms/ipe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3087/devel
Modified Files:
ipe.spec
Added Files:
ipe_6.0pre26-qmake-defines.patch
Log Message:
* Thu Aug 31 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org>
- 6.0-0.11.pre26
- New try to rebuild ipe-6.0pre26 for FC-6 mass rebuild.
- New patch: ipe_6.0pre26-qmake-defines.patch
This patch changes the dealing of macros whose values should contain double
quotes (needed under FC-6, which has qmake-4.2).
- New comments around the patches, to describe them.
ipe_6.0pre26-qmake-defines.patch:
--- NEW FILE ipe_6.0pre26-qmake-defines.patch ---
--- ipe-6.0pre26/src/ipemodel/ipeprefs.cpp.defines.bak 2006-08-31 19:15:38.000000000 +0200
+++ ipe-6.0pre26/src/ipemodel/ipeprefs.cpp 2006-08-31 19:19:58.000000000 +0200
@@ -108,6 +108,9 @@
return This;
}
+#define IPE_QUOTE_(x) #x
+#define IPE_QUOTE(x) IPE_QUOTE_(x)
+
//! Constructor sets up preferences.
/*! Preferences are read from the preferences file
(<tt>$HOME/.iperc</tt> on Unix, <tt>$HOME/_ipecfg</tt> on Windows).
@@ -158,12 +161,12 @@
if (!ipedir.exists())
home.mkdir(QLatin1String(".ipe"));
iLatexDir = ipedir.filePath(QLatin1String("latexrun"));
- iDocDir = QLatin1String(IPEDOCDIR);
- iFontmap = QLatin1String(IPEFONTMAP);
- iStdKeysFileName = QLatin1String(IPEKEYSFILE);
- iBrowser = QLatin1String(IPEBROWSER);
- iIpeletPath.append(QLatin1String(IPELETPATH));
- iLangDir = QLatin1String(IPELANGDIR);
+ iDocDir = QLatin1String(IPE_QUOTE(IPEDOCDIR));
+ iFontmap = QLatin1String(IPE_QUOTE(IPEFONTMAP));
+ iStdKeysFileName = QLatin1String(IPE_QUOTE(IPEKEYSFILE));
+ iBrowser = QLatin1String(IPE_QUOTE(IPEBROWSER));
+ iIpeletPath.append(QLatin1String(IPE_QUOTE(IPELETPATH)));
+ iLangDir = QLatin1String(IPE_QUOTE(IPELANGDIR));
#endif
iPdfLatex = QLatin1String("pdflatex");
const char *p;
--- ipe-6.0pre26/src/ipemodel/ipemodel.pro.defines.bak 2006-08-31 19:13:53.000000000 +0200
+++ ipe-6.0pre26/src/ipemodel/ipemodel.pro 2006-08-31 19:14:29.000000000 +0200
@@ -23,12 +23,12 @@
SOURCES += ipeprefs.cpp
SOURCES += ipeq.cpp
# --------------------------------------------------------------------
-unix:DEFINES += IPEDOCDIR=\"$$IPEDOCDIR\"
-unix:DEFINES += IPELETPATH=\"$$IPELETPATH\"
-unix:DEFINES += IPEFONTMAP=\"$$IPEFONTMAP\"
-unix:DEFINES += IPEKEYSFILE=\"$$IPEKEYSFILE\"
-unix:DEFINES += IPEBROWSER=\"$$IPEBROWSER\"
-unix:DEFINES += IPELANGDIR=\"$$IPELANGDIR\"
+unix:DEFINES += IPEDOCDIR=$$IPEDOCDIR
+unix:DEFINES += IPELETPATH=$$IPELETPATH
+unix:DEFINES += IPEFONTMAP=$$IPEFONTMAP
+unix:DEFINES += IPEKEYSFILE=$$IPEKEYSFILE
+unix:DEFINES += IPEBROWSER=$$IPEBROWSER
+unix:DEFINES += IPELANGDIR=$$IPELANGDIR
# --------------------------------------------------------------------
unix:target.path = $${IPELIBDIR}
unix:INSTALLS += target
Index: ipe.spec
===================================================================
RCS file: /cvs/extras/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ipe.spec 28 Aug 2006 16:23:08 -0000 1.5
+++ ipe.spec 1 Sep 2006 12:34:48 -0000 1.6
@@ -2,17 +2,27 @@
Name: ipe
Version: 6.0
-Release: 0.10.%{preversion}%{?dist}
+Release: 0.11.%{preversion}%{?dist}
Summary: The Ipe extensible drawing editor
Group: Applications/Publishing
License: GPL
URL: http://ipe.compgeom.org/
Source0: http://ipe.compgeom.org/%{name}-%{version}%{preversion}-src.tar.gz
+
+###### Patches
+# Fix a warning about incorrect use of %d with size_t in printf.
Patch0: ipe-6.0pre26-printf-size_t.patch
+# Fix incorrect use of CONFIG=dll for dlopened libraries (plugins).
Patch1: ipe-6.0pre26-ipelet-pro_files.patch
+# Fix a typo in a signal name.
Patch2: ipe_6.0pre26-initui.cpp.patch
+# Use LIBS instead of -L.
Patch3: ipe_6.0pre26-libpath.patch
+# Avoid the use of double quotes in a macro value.
+Patch4: ipe_6.0pre26-qmake-defines.patch
+
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
@@ -55,6 +65,7 @@
%patch1 -p1 -b .plugin.bak
%patch2 -p1 -b .AboutToShow.bak
%patch3 -p0 -b .libpath.bak
+%patch4 -p1 -b .defines.bak
%build
export QTDIR=%{qtdir}
@@ -161,6 +172,13 @@
%{_datadir}/ipe/%{version}/doc
%changelog
+* Thu Aug 31 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.11.pre26
+- New try to rebuild ipe-6.0pre26 for FC-6 mass rebuild.
+- New patch: ipe_6.0pre26-qmake-defines.patch
+ This patch changes the dealing of macros whose values should contain double
+ quotes (needed under FC-6, which has qmake-4.2).
+- New comments around the patches, to describe them.
+
* Mon Aug 28 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.10.pre26
- Rebuild for FC-6.
More information about the scm-commits
mailing list