diff options
Diffstat (limited to 'redhat/applications/piklab')
| -rw-r--r-- | redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch | 33 | ||||
| -rw-r--r-- | redhat/applications/piklab/trinity-piklab.spec | 27 |
2 files changed, 51 insertions, 9 deletions
diff --git a/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..9b3adfbce --- /dev/null +++ b/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,33 @@ +--- piklab/src/common/common/range.h.ORI 2012-05-06 11:39:36.080834047 +0200 ++++ piklab/src/common/common/range.h 2012-05-06 11:39:43.239684938 +0200 +@@ -43,7 +43,7 @@ + { + public: + GenericRangeVector() {} +- GenericRangeVector(const RangeType &range) { append(range); } ++ GenericRangeVector(const RangeType &range) { this->append(range); } + bool isEmpty() const { + uint nb = this->count(); + for (uint i=0; i<nb; i++) if ( !this->at(i).isEmpty() ) return false; +--- piklab/src/xml_to_data/device_xml_to_data.h.ORI 2012-05-06 11:45:56.824911257 +0200 ++++ piklab/src/xml_to_data/device_xml_to_data.h 2012-05-06 11:46:04.135759246 +0200 +@@ -76,7 +76,7 @@ + TQValueList<DataType *> list; + for (it=_map.begin(); it!=_map.end(); ++it) + list.append(const_cast<DataType *>(static_cast<const DataType *>(it.data()))); +- uint size = toCppString(list, ts); ++ uint size = this->toCppString(list, ts); + ts << ";" << endl; + ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl; + file.close(); +--- piklab/src/devices/base/device_group.h.ORI 2012-05-06 11:47:08.950411718 +0200 ++++ piklab/src/devices/base/device_group.h 2012-05-06 11:47:17.607231757 +0200 +@@ -52,7 +52,7 @@ + { + protected: + virtual void initSupported() { +- TQValueList<DataType *> list = fromCppString(dataStream(), dataSize()); ++ TQValueList<DataType *> list = this->fromCppString(dataStream(), dataSize()); + for (uint i=0; i<uint(list.count()); i++) addDevice(list[i]->name(), list[i], ::Group::Support::Tested); + } + virtual uint dataSize() const = 0; diff --git a/redhat/applications/piklab/trinity-piklab.spec b/redhat/applications/piklab/trinity-piklab.spec index a2c698665..f1ccb45be 100644 --- a/redhat/applications/piklab/trinity-piklab.spec +++ b/redhat/applications/piklab/trinity-piklab.spec @@ -1,12 +1,13 @@ # Default version for this component %define kdecomp piklab %define version 0.15.2 -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc +%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables @@ -33,6 +34,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [piklab] Fix compilation with GCC 4.7 [Bug #958] +Patch1: piklab-3.5.13-fix_gcc47_compilation.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -53,15 +57,16 @@ are supported. A command-line programmer and debugger are also available. %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -114,13 +119,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_docdir}/HTML/en/piklab %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/mimelnk/application/x-piklab.desktop -%{_mandir}/man1/piklab-coff.1.gz -%{_mandir}/man1/piklab-hex.1.gz -%{_mandir}/man1/piklab-prog.1.gz -%{_mandir}/man1/piklab.1.gz +%{_mandir}/man1/piklab-coff.1 +%{_mandir}/man1/piklab-hex.1 +%{_mandir}/man1/piklab-prog.1 +%{_mandir}/man1/piklab.1 %Changelog +* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3 +- Fix MAN directory location +- Fix compilation with GCC 4.7 [Bug #958] + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2 - Fix HTML directory location |