François Andriot
10 years ago
parent
a98097e3a0
commit
53fefa83f5
@ -1,369 +0,0 @@
|
||||
# Default version for this component
|
||||
%if "%{?version}" == ""
|
||||
%define version 3.5.12
|
||||
%endif
|
||||
%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
|
||||
%endif
|
||||
|
||||
# TDE 3.5.12 specific building variables
|
||||
BuildRequires: autoconf automake libtool m4
|
||||
%define tde_docdir %{_docdir}
|
||||
%define tde_includedir %{_includedir}/kde
|
||||
%define tde_libdir %{_libdir}/kde3
|
||||
|
||||
|
||||
Name: trinity-kdegraphics
|
||||
Version: %{?version}
|
||||
Release: %{?release}%{?dist}%{_variant}
|
||||
License: GPL
|
||||
Summary: K Desktop Environment - Graphics Applications
|
||||
|
||||
Group: Applications/Multimedia
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
Prefix: %{_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: kdegraphics-%{version}.tar.gz
|
||||
|
||||
# Official TDE patches (from SVN)
|
||||
# Fix kdegraphics FTBFS under gcc4.6
|
||||
# Thanks to David Rankin for the patch!
|
||||
Patch0: r1242777.diff
|
||||
|
||||
# [kdegraphics/kviewshell]: GCC >= 4.5 fix
|
||||
# avoid "documentWidget.cpp:290:70: error: taking address of temporary"
|
||||
Patch1: kdegraphics-documentwidget-gcc45.patch
|
||||
|
||||
BuildRequires: tqtinterface-devel
|
||||
BuildRequires: trinity-kdelibs-devel
|
||||
BuildRequires: trinity-kdebase-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libmng-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libungif-devel
|
||||
BuildRequires: automake libtool
|
||||
BuildRequires: gphoto2-devel
|
||||
BuildRequires: sane-backends-devel
|
||||
BuildRequires: libusb-devel
|
||||
|
||||
|
||||
# kgamma
|
||||
BuildRequires: libXxf86vm-devel
|
||||
# kuickshow
|
||||
BuildRequires: imlib-devel
|
||||
#kfile-plugin
|
||||
BuildRequires: OpenEXR-devel
|
||||
# kpdf
|
||||
BuildRequires: freetype-devel
|
||||
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
|
||||
BuildRequires: poppler-qt-devel
|
||||
%else
|
||||
BuildRequires: poppler-devel
|
||||
%endif
|
||||
BuildRequires: libpaper-devel
|
||||
# ksvg
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: fribidi-devel
|
||||
BuildRequires: lcms-devel
|
||||
BuildRequires: libart_lgpl-devel
|
||||
BuildRequires: libXmu-devel
|
||||
# kpovmodeler
|
||||
BuildRequires: libGL-devel libGLU-devel libXi-devel
|
||||
|
||||
Requires: tqtinterface
|
||||
Requires: trinity-arts
|
||||
Requires: trinity-kdelibs
|
||||
Requires: ghostscript
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
%if "%{_prefix}" == "/usr"
|
||||
Provides: kdegraphics3 = %{version}-%{release}
|
||||
Conflicts: kdegraphics
|
||||
%endif
|
||||
|
||||
%description
|
||||
Graphics applications for the K Desktop Environment, including
|
||||
* kamera (digital camera support)
|
||||
* kcoloredit (palette editor and color chooser)
|
||||
* kdvi (displays TeX .dvi files)
|
||||
* kghostview (displays postscript files)
|
||||
* kiconedit (icon editor)
|
||||
* kooka (scanner application)
|
||||
* kpdf (displays PDF files)
|
||||
* kruler (screen ruler and color measurement tool)
|
||||
* ksnapshot (screen capture utility)
|
||||
* kview (image viewer for GIF, JPEG, TIFF, etc.)
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Provides: kdegraphics3-devel = %{version}-%{release}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Group: Development/Libraries
|
||||
%description devel
|
||||
%{summary}.
|
||||
|
||||
## FIXME: move more stuff to -extras
|
||||
%package extras
|
||||
Summary: Extra applications from %{name}
|
||||
Group: Applications/Multimedia
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
%description extras
|
||||
%{summary}, including:
|
||||
* kfax
|
||||
* kfaxview
|
||||
* kpovmodler
|
||||
|
||||
%package libs
|
||||
Summary: %{name} runtime libraries
|
||||
Group: System Environment/Libraries
|
||||
Requires: trinity-kdelibs >= %{version}
|
||||
# include to be paranoid, installing libs-only is still mostly untested -- Rex
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description libs
|
||||
%{summary}.
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n kdegraphics
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
%build
|
||||
unset QTDIR || : ; . /etc/profile.d/qt.sh
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
|
||||
|
||||
%configure \
|
||||
--enable-new-ldflags \
|
||||
--disable-dependency-tracking \
|
||||
--disable-rpath \
|
||||
--disable-debug \
|
||||
--disable-warnings \
|
||||
--enable-final \
|
||||
--includedir=%{_includedir}/kde \
|
||||
--with-xinerama \
|
||||
--with-extra-includes=%{_includedir}/tqt
|
||||
|
||||
%if 0%{?fedora} >= 15
|
||||
# Ugly fix for kolourpaint - problem when linking libkdefx.so
|
||||
sed -i kolourpaint/Makefile \
|
||||
-e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,'
|
||||
|
||||
# Another ugly fix for kpdf - problem when linking fontconfig
|
||||
sed -i kpdf/Makefile \
|
||||
-e '/^LDFLAGS = .*/ s,$, -lfontconfig,'
|
||||
%endif
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
# locale's
|
||||
%find_lang %{name} || touch %{name}.lang
|
||||
HTML_DIR=$(kde-config --expandvars --install html)
|
||||
if [ -d %{buildroot}$HTML_DIR ]; then
|
||||
for lang_dir in %{buildroot}$HTML_DIR/* ; do
|
||||
if [ -d $lang_dir ]; then
|
||||
lang=$(basename $lang_dir)
|
||||
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
|
||||
# replace absolute symlinks with relative ones
|
||||
pushd $lang_dir
|
||||
for i in *; do
|
||||
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
|
||||
done
|
||||
popd
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# rpmdocs
|
||||
for dir in k* ; do
|
||||
for file in AUTHORS ChangeLog README TODO ; do
|
||||
if test -s "$dir/$file" ; then
|
||||
install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
|
||||
echo "%doc rpmdocs/$dir/" >> %{name}.lang
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
# unpackaged files
|
||||
# omit kpovmodeler-devel files (for now) -- Rex
|
||||
rm -f %{buildroot}/libkpovmodeler.so
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
for f in crystalsvg hicolor ; do
|
||||
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||
done
|
||||
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||
|
||||
%postun
|
||||
for f in crystalsvg hicolor ; do
|
||||
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||
done
|
||||
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||
|
||||
%post libs
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun libs
|
||||
/sbin/ldconfig
|
||||
|
||||
%post extras
|
||||
/sbin/ldconfig ||:
|
||||
for f in crystalsvg hicolor ; do
|
||||
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||
done
|
||||
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||
|
||||
%postun extras
|
||||
/sbin/ldconfig ||:
|
||||
for f in crystalsvg hicolor ; do
|
||||
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||
done
|
||||
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||
|
||||
|
||||
%files extras
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
# kfax
|
||||
%doc rpmdocs/kfax/
|
||||
%{_bindir}/kfax
|
||||
%{_datadir}/applications/kde/kfax.desktop
|
||||
%{_datadir}/apps/kfax/
|
||||
%{_datadir}/icons/hicolor/??x??/apps/kfax.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
|
||||
|
||||
# kfaxview
|
||||
%{_bindir}/kfaxview
|
||||
%{_libdir}/libkfaximage.so
|
||||
%{_libdir}/libkfaximage.la
|
||||
%{tde_libdir}/kfaxviewpart.*
|
||||
%{_datadir}/applications/kde/kfaxview.desktop
|
||||
%{_datadir}/apps/kfaxview/
|
||||
%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
|
||||
%{_datadir}/services/kfaxmultipage.desktop
|
||||
%{_datadir}/services/kfaxmultipage_tiff.desktop
|
||||
|
||||
# kpovmodeler
|
||||
%doc rpmdocs/kpovmodeler/
|
||||
%doc %{_docdir}/HTML/en/kpovmodeler/
|
||||
%{_bindir}/kpovmodeler
|
||||
%{_libdir}/libkpovmodeler.so.*
|
||||
%{_libdir}/libkpovmodeler.la
|
||||
%{tde_libdir}/libkpovmodelerpart.*
|
||||
%{_datadir}/applications/kde/kpovmodeler.desktop
|
||||
%{_datadir}/apps/kpovmodeler/
|
||||
%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
|
||||
%{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING README
|
||||
%doc rpmdocs/*
|
||||
|
||||
# kfax
|
||||
%exclude %{_bindir}/kfax
|
||||
%exclude %{_datadir}/applications/kde/kfax.desktop
|
||||
%exclude %{_datadir}/apps/kfax/
|
||||
%exclude %{_datadir}/icons/hicolor/*/apps/kfax.*
|
||||
|
||||
# kfaxview
|
||||
%exclude %{_bindir}/kfaxview
|
||||
%exclude %{_libdir}/libkfaximage.so
|
||||
%exclude %{_libdir}/libkfaximage.la
|
||||
%exclude %{tde_libdir}/kfaxviewpart.*
|
||||
%exclude %{_datadir}/applications/kde/kfaxview.desktop
|
||||
%exclude %{_datadir}/apps/kfaxview/
|
||||
%exclude %{_datadir}/icons/hicolor/*/apps/kfaxview.*
|
||||
%exclude %{_datadir}/services/kfaxmultipage.desktop
|
||||
%exclude %{_datadir}/services/kfaxmultipage_tiff.desktop
|
||||
|
||||
# kpovmodeler
|
||||
%exclude %{tde_docdir}/HTML/en/kpovmodeler/
|
||||
%exclude %{_bindir}/kpovmodeler
|
||||
%exclude %{_libdir}/libkpovmodeler.*
|
||||
%exclude %{tde_libdir}/libkpovmodelerpart.*
|
||||
%exclude %{_datadir}/applications/kde/kpovmodeler.desktop
|
||||
%exclude %{_datadir}/apps/kpovmodeler/
|
||||
%exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
|
||||
%exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
|
||||
|
||||
%{_bindir}/*
|
||||
%{_datadir}/applications/kde/*.desktop
|
||||
%{_datadir}/applnk/Graphics/*kruler.desktop
|
||||
%{_datadir}/apps/*
|
||||
%{_datadir}/icons/crystalsvg/*/*/*
|
||||
%{_datadir}/icons/hicolor/*/*/*
|
||||
%{_datadir}/config*/*
|
||||
%{_datadir}/service*/*
|
||||
%{_datadir}/mimelnk/*/*
|
||||
%{_libdir}/libkdeinit_*.so
|
||||
%{tde_libdir}/*
|
||||
|
||||
%files libs
|
||||
%defattr(-,root,root,-)
|
||||
%exclude %{_libdir}/libkfaximage.la
|
||||
%exclude %{_libdir}/libkpovmodeler.la
|
||||
%exclude %{_libdir}/libkpovmodeler.so.*
|
||||
%{_libdir}/lib*.so.*
|
||||
%{_libdir}/lib*.la
|
||||
# Why ???
|
||||
%{_libdir}/libdjvu.so
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/kde/*
|
||||
%{_libdir}/lib*.so
|
||||
#exclude %{_libdir}/libkpovmodeler.so
|
||||
%exclude %{_libdir}/libkfaximage.so
|
||||
%exclude %{_libdir}/libkdeinit_*.so
|
||||
%exclude %{_libdir}/libdjvu.so
|
||||
|
||||
%changelog
|
||||
* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
|
||||
- Add support for RHEL5
|
||||
|
||||
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
|
||||
- Import to GIT
|
||||
|
||||
* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
|
||||
- Add fix for Fedora 15
|
||||
- Add 'patch0' and 'patch1' for GCC >= 4.5
|
||||
- Correct macro to install under "/opt", if desired
|
||||
|
||||
* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
|
||||
- Initial release for RHEL 6.0
|
||||
- SPEC file taken from Fedora 8 "kdegraphics 7:3.5.10-1"
|
||||
@ -1,41 +0,0 @@
|
||||
commit b2d01d000c11d7c0dd183e1af059f81ac5249c25
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1339541595 -0500
|
||||
|
||||
Add poppler-tqt.pc file
|
||||
|
||||
diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
|
||||
index d07e813..42d50a8 100644
|
||||
--- a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
|
||||
+++ b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
|
||||
@@ -28,6 +28,12 @@ link_directories(
|
||||
${TQT_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
+##### pc files ##################################
|
||||
+
|
||||
+configure_file( poppler-tqt.pc.cmake poppler-tqt.pc @ONLY )
|
||||
+
|
||||
+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-tqt.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
|
||||
+
|
||||
##### headers ###################################
|
||||
|
||||
install( FILES
|
||||
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
|
||||
new file mode 100644
|
||||
index 0000000..ce2b40d
|
||||
--- /dev/null
|
||||
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
|
||||
@@ -0,0 +1,12 @@
|
||||
+prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+exec_prefix=${prefix}
|
||||
+libdir=${exec_prefix}/lib
|
||||
+includedir=${prefix}/include
|
||||
+
|
||||
+Name: poppler-tqt
|
||||
+Description: TQt bindings for poppler
|
||||
+Version: @POPPLER_VERSION@
|
||||
+Requires: poppler = @POPPLER_VERSION@
|
||||
+
|
||||
+Libs: -L${libdir} -lpoppler-tqt
|
||||
+Cflags: -I${includedir}
|
||||
@ -1,10 +0,0 @@
|
||||
--- kdegraphics/doc/kuickshow/CMakeLists.txt.ORI 2012-08-02 20:57:35.855904888 +0000
|
||||
+++ kdegraphics/doc/kuickshow/CMakeLists.txt 2012-08-02 20:57:53.872026818 +0000
|
||||
@@ -9,4 +9,6 @@
|
||||
#
|
||||
#################################################
|
||||
|
||||
-tde_create_handbook( DESTINATION kuickshow )
|
||||
+if( BUILD_KUICKSHOW )
|
||||
+ tde_create_handbook( DESTINATION kuickshow )
|
||||
+endif( )
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdegraphics.ORI/kfile-plugins/dependencies/CMakeLists.txt 2011-07-31 08:24:04.000000000 +0200
|
||||
+++ kdegraphics/kfile-plugins/dependencies/CMakeLists.txt 2011-10-30 14:42:03.000000000 +0100
|
||||
@@ -9,4 +9,6 @@
|
||||
#
|
||||
#################################################
|
||||
|
||||
-add_subdirectory( poppler-tqt )
|
||||
\ Pas de fin de ligne à la fin du fichier.
|
||||
+if( WITH_PDF )
|
||||
+ add_subdirectory( poppler-tqt )
|
||||
+endif ( )
|
||||
@ -1,17 +0,0 @@
|
||||
commit d655a9f8e32b1e948f54eb8e0f33b5de629e25b3
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1340997300 -0500
|
||||
|
||||
Fix corrupt image file.
|
||||
Thanks to E. Liddell.
|
||||
|
||||
diff --git a/ksvg/test/tiger.svg b/ksvg/test/tiger.svg
|
||||
index f2c1391..4a2e3b5 100644
|
||||
--- a/ksvg/test/tiger.svg
|
||||
+++ b/ksvg/test/tiger.svg
|
||||
@@ -1,4 +1,4 @@
|
||||
-<svg>
|
||||
+<svg xmlns="http://www.w3.org/2000/svg">
|
||||
<g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
|
||||
<path d="M-122.304 84.285C-122.304 84.285 -122.203 86.179 -123.027 86.16C-123.851 86.141 -140.305 38.066 -160.833 40.309C-160.833 40.309 -143.05 32.956 -122.304 84.285z"/>
|
||||
</g>
|
||||
@ -1,307 +0,0 @@
|
||||
--- kdegraphics/kmrml/kmrml/mrml_elements.h.ORI 2012-04-25 23:02:52.323845593 +0200
|
||||
+++ kdegraphics/kmrml/kmrml/mrml_elements.h 2012-04-25 23:03:23.373552145 +0200
|
||||
@@ -157,7 +157,7 @@
|
||||
TQDomElement elem = list.item( i ).toElement();
|
||||
t item( elem );
|
||||
if ( item.isValid() )
|
||||
- append( item );
|
||||
+ this->append( item );
|
||||
}
|
||||
}
|
||||
|
||||
--- kdegraphics/kviewshell/plugins/djvu/libdjvu/GContainer.h.gcc47 2011-08-13 08:06:40.000000000 +0200
|
||||
+++ kdegraphics/kviewshell/plugins/djvu/libdjvu/GContainer.h 2012-04-25 23:15:09.391133568 +0200
|
||||
@@ -133,6 +133,93 @@
|
||||
#$Id: GContainer.h,v 1.15 2004/05/13 15:16:34 leonb Exp $# */
|
||||
//@{
|
||||
|
||||
+// ------------------------------------------------------------
|
||||
+// HASH FUNCTIONS
|
||||
+// ------------------------------------------------------------
|
||||
+
|
||||
+
|
||||
+/** @name Hash functions
|
||||
+ These functions let you use template class \Ref{GMap} with the
|
||||
+ corresponding elementary types. The returned hash code may be reduced to
|
||||
+ an arbitrary range by computing its remainder modulo the upper bound of
|
||||
+ the range.
|
||||
+ @memo Hash functions for elementary types. */
|
||||
+//@{
|
||||
+
|
||||
+/** Hashing function (unsigned int). */
|
||||
+static inline unsigned int
|
||||
+hash(const unsigned int & x)
|
||||
+{
|
||||
+ return x;
|
||||
+}
|
||||
+
|
||||
+/** Hashing function (int). */
|
||||
+static inline unsigned int
|
||||
+hash(const int & x)
|
||||
+{
|
||||
+ return (unsigned int)x;
|
||||
+}
|
||||
+
|
||||
+/** Hashing function (long). */
|
||||
+static inline unsigned int
|
||||
+hash(const long & x)
|
||||
+{
|
||||
+ return (unsigned int)x;
|
||||
+}
|
||||
+
|
||||
+/** Hashing function (unsigned long). */
|
||||
+static inline unsigned int
|
||||
+hash(const unsigned long & x)
|
||||
+{
|
||||
+ return (unsigned int)x;
|
||||
+}
|
||||
+
|
||||
+/** Hashing function (void *). */
|
||||
+static inline unsigned int
|
||||
+hash(void * const & x)
|
||||
+{
|
||||
+ return (unsigned long) x;
|
||||
+}
|
||||
+
|
||||
+/** Hashing function (const void *). */
|
||||
+static inline unsigned int
|
||||
+hash(const void * const & x)
|
||||
+{
|
||||
+ return (unsigned long) x;
|
||||
+}
|
||||
+
|
||||
+/** Hashing function (float). */
|
||||
+static inline unsigned int
|
||||
+hash(const float & x)
|
||||
+{
|
||||
+ // optimizer will get rid of unnecessary code
|
||||
+ unsigned int *addr = (unsigned int*)&x;
|
||||
+ if (sizeof(float)<2*sizeof(unsigned int))
|
||||
+ return addr[0];
|
||||
+ else
|
||||
+ return addr[0]^addr[1];
|
||||
+}
|
||||
+
|
||||
+/** Hashing function (double). */
|
||||
+static inline unsigned int
|
||||
+hash(const double & x)
|
||||
+{
|
||||
+ // optimizer will get rid of unnecessary code
|
||||
+ unsigned int *addr = (unsigned int*)&x;
|
||||
+ if (sizeof(double)<2*sizeof(unsigned int))
|
||||
+ return addr[0];
|
||||
+ else if (sizeof(double)<4*sizeof(unsigned int))
|
||||
+ return addr[0]^addr[1];
|
||||
+ else
|
||||
+ return addr[0]^addr[1]^addr[2]^addr[3];
|
||||
+}
|
||||
+
|
||||
+
|
||||
+//@}
|
||||
+//@}
|
||||
+//@}
|
||||
+
|
||||
+// ------------ THE END
|
||||
|
||||
|
||||
// ------------------------------------------------------------
|
||||
@@ -887,21 +974,21 @@
|
||||
/** Inserts an element after the last element of the list.
|
||||
The new element is initialized with a copy of argument #elt#. */
|
||||
void append(const TYPE &elt)
|
||||
- { GListImpl<TI>::append(newnode((const TI&)elt)); }
|
||||
+ { GListImpl<TI>::append(this->newnode((const TI&)elt)); }
|
||||
/** Inserts an element before the first element of the list.
|
||||
The new element is initialized with a copy of argument #elt#. */
|
||||
void prepend(const TYPE &elt)
|
||||
- { GListImpl<TI>::prepend(newnode((const TI&)elt)); }
|
||||
+ { GListImpl<TI>::prepend(this->newnode((const TI&)elt)); }
|
||||
/** Inserts a new element after the list element at position #pos#. When
|
||||
position #pos# is null the element is inserted at the beginning of the
|
||||
list. The new element is initialized with a copy of #elt#. */
|
||||
void insert_after(GPosition pos, const TYPE &elt)
|
||||
- { GListImpl<TI>::insert_after(pos, newnode((const TI&)elt)); }
|
||||
+ { GListImpl<TI>::insert_after(pos, this->newnode((const TI&)elt)); }
|
||||
/** Inserts a new element before the list element at position #pos#. When
|
||||
position #pos# is null the element is inserted at the end of the
|
||||
list. The new element is initialized with a copy of #elt#. */
|
||||
void insert_before(GPosition pos, const TYPE &elt)
|
||||
- { GListImpl<TI>::insert_before(pos, newnode((const TI&)elt)); }
|
||||
+ { GListImpl<TI>::insert_before(pos, this->newnode((const TI&)elt)); }
|
||||
/** Inserts an element of another list into this list. This function
|
||||
removes the element at position #frompos# in list #frompos#, inserts it
|
||||
in the current list before the element at position #pos#, and advances
|
||||
@@ -1039,7 +1126,7 @@
|
||||
GPosition contains(const K &key) const
|
||||
{ return GPosition( get(key), (void*)this); }
|
||||
void del(const K &key)
|
||||
- { deletenode(get(key)); }
|
||||
+ { this->deletenode(this->get(key)); }
|
||||
};
|
||||
|
||||
template<class K>
|
||||
@@ -1067,7 +1154,7 @@
|
||||
template<class K> GCONT HNode *
|
||||
GSetImpl<K>::get_or_throw(const K &key) const
|
||||
{
|
||||
- HNode *m = get(key);
|
||||
+ HNode *m = this->get(key);
|
||||
if (!m)
|
||||
{
|
||||
G_THROW( ERR_MSG("GContainer.cannot_add") );
|
||||
@@ -1078,14 +1165,14 @@
|
||||
template<class K> inline GCONT HNode *
|
||||
GSetImpl<K>::get_or_throw(const K &key) const
|
||||
{
|
||||
- return get(key);
|
||||
+ return this->get(key);
|
||||
}
|
||||
#endif
|
||||
|
||||
template<class K> GCONT HNode *
|
||||
GSetImpl<K>::get_or_create(const K &key)
|
||||
{
|
||||
- HNode *m = get(key);
|
||||
+ HNode *m = this->get(key);
|
||||
if (m) return m;
|
||||
SNode *n = (SNode*) operator new (sizeof(SNode));
|
||||
#if GCONTAINER_ZERO_FILL
|
||||
@@ -1093,7 +1180,7 @@
|
||||
#endif
|
||||
new ((void*)&(n->key)) K ( key );
|
||||
n->hashcode = hash((const K&)(n->key));
|
||||
- installnode(n);
|
||||
+ this->installnode(n);
|
||||
return n;
|
||||
}
|
||||
|
||||
@@ -1122,7 +1209,7 @@
|
||||
template<class K, class TI> GCONT HNode *
|
||||
GMapImpl<K,TI>::get_or_create(const K &key)
|
||||
{
|
||||
- GCONT HNode *m = get(key);
|
||||
+ GCONT HNode *m = this->get(key);
|
||||
if (m) return m;
|
||||
MNode *n = (MNode*) operator new (sizeof(MNode));
|
||||
#if GCONTAINER_ZERO_FILL
|
||||
@@ -1131,7 +1218,7 @@
|
||||
new ((void*)&(n->key)) K (key);
|
||||
new ((void*)&(n->val)) TI ();
|
||||
n->hashcode = hash((const K&)(n->key));
|
||||
- installnode(n);
|
||||
+ this->installnode(n);
|
||||
return n;
|
||||
}
|
||||
|
||||
@@ -1197,13 +1284,13 @@
|
||||
contains key #key#. This variant of #operator[]# is necessary when
|
||||
dealing with a #const GMAP<KTYPE,VTYPE>#. */
|
||||
const VTYPE& operator[](const KTYPE &key) const
|
||||
- { return (const VTYPE&)(((const typename GMapImpl<KTYPE,TI>::MNode*)(get_or_throw(key)))->val); }
|
||||
+ { return (const VTYPE&)(((const typename GMapImpl<KTYPE,TI>::MNode*)(this->get_or_throw(key)))->val); }
|
||||
/** Returns a reference to the value of the map entry for key #key#. This
|
||||
reference can be used for both reading (as "#a[n]#") and modifying (as
|
||||
"#a[n]=v#"). If there is no entry for key #key#, a new entry is created
|
||||
for that key with the null constructor #VTYPE::VTYPE()#. */
|
||||
VTYPE& operator[](const KTYPE &key)
|
||||
- { return (VTYPE&)(((typename GMapImpl<KTYPE,TI>::MNode*)(get_or_create(key)))->val); }
|
||||
+ { return (VTYPE&)(((typename GMapImpl<KTYPE,TI>::MNode*)(this->get_or_create(key)))->val); }
|
||||
/** Destroys the map entry for position #pos#.
|
||||
Nothing is done if position #pos# is not a valid position. */
|
||||
void del(GPosition &pos)
|
||||
@@ -1266,95 +1353,6 @@
|
||||
};
|
||||
|
||||
|
||||
-// ------------------------------------------------------------
|
||||
-// HASH FUNCTIONS
|
||||
-// ------------------------------------------------------------
|
||||
-
|
||||
-
|
||||
-/** @name Hash functions
|
||||
- These functions let you use template class \Ref{GMap} with the
|
||||
- corresponding elementary types. The returned hash code may be reduced to
|
||||
- an arbitrary range by computing its remainder modulo the upper bound of
|
||||
- the range.
|
||||
- @memo Hash functions for elementary types. */
|
||||
-//@{
|
||||
-
|
||||
-/** Hashing function (unsigned int). */
|
||||
-static inline unsigned int
|
||||
-hash(const unsigned int & x)
|
||||
-{
|
||||
- return x;
|
||||
-}
|
||||
-
|
||||
-/** Hashing function (int). */
|
||||
-static inline unsigned int
|
||||
-hash(const int & x)
|
||||
-{
|
||||
- return (unsigned int)x;
|
||||
-}
|
||||
-
|
||||
-/** Hashing function (long). */
|
||||
-static inline unsigned int
|
||||
-hash(const long & x)
|
||||
-{
|
||||
- return (unsigned int)x;
|
||||
-}
|
||||
-
|
||||
-/** Hashing function (unsigned long). */
|
||||
-static inline unsigned int
|
||||
-hash(const unsigned long & x)
|
||||
-{
|
||||
- return (unsigned int)x;
|
||||
-}
|
||||
-
|
||||
-/** Hashing function (void *). */
|
||||
-static inline unsigned int
|
||||
-hash(void * const & x)
|
||||
-{
|
||||
- return (unsigned long) x;
|
||||
-}
|
||||
-
|
||||
-/** Hashing function (const void *). */
|
||||
-static inline unsigned int
|
||||
-hash(const void * const & x)
|
||||
-{
|
||||
- return (unsigned long) x;
|
||||
-}
|
||||
-
|
||||
-/** Hashing function (float). */
|
||||
-static inline unsigned int
|
||||
-hash(const float & x)
|
||||
-{
|
||||
- // optimizer will get rid of unnecessary code
|
||||
- unsigned int *addr = (unsigned int*)&x;
|
||||
- if (sizeof(float)<2*sizeof(unsigned int))
|
||||
- return addr[0];
|
||||
- else
|
||||
- return addr[0]^addr[1];
|
||||
-}
|
||||
-
|
||||
-/** Hashing function (double). */
|
||||
-static inline unsigned int
|
||||
-hash(const double & x)
|
||||
-{
|
||||
- // optimizer will get rid of unnecessary code
|
||||
- unsigned int *addr = (unsigned int*)&x;
|
||||
- if (sizeof(double)<2*sizeof(unsigned int))
|
||||
- return addr[0];
|
||||
- else if (sizeof(double)<4*sizeof(unsigned int))
|
||||
- return addr[0]^addr[1];
|
||||
- else
|
||||
- return addr[0]^addr[1]^addr[2]^addr[3];
|
||||
-}
|
||||
-
|
||||
-
|
||||
-//@}
|
||||
-//@}
|
||||
-//@}
|
||||
-
|
||||
-// ------------ THE END
|
||||
-
|
||||
-
|
||||
#ifdef HAVE_NAMESPACES
|
||||
}
|
||||
# ifndef NOT_USING_DJVU_NAMESPACE
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI 2012-08-01 19:42:18.057554419 +0200
|
||||
+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt 2012-08-01 19:42:28.320371892 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
install( FILES
|
||||
poppler-qt.h poppler-page-transition.h poppler-link-qt3.h
|
||||
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
|
||||
+ DESTINATION ${INCLUDE_INSTALL_DIR} )
|
||||
|
||||
##### poppler-tqt (shared) ############################
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake.ORI 2012-05-06 19:23:47.668667462 +0200
|
||||
+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake 2012-05-06 19:21:43.311268611 +0200
|
||||
@@ -1,3 +1,13 @@
|
||||
+# Poppler
|
||||
+if( BUILD_KPDF )
|
||||
+ pkg_search_module( POPPLER poppler )
|
||||
+ if( POPPLER_FOUND )
|
||||
+ set( HAVE_POPPLER 1 )
|
||||
+ else( )
|
||||
+ tde_message_fatal( "poppler is required, but was not found on your system" )
|
||||
+ endif( )
|
||||
+endif( )
|
||||
+
|
||||
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
|
||||
set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
|
||||
set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} "-lpoppler" )
|
||||
--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI 2012-05-06 19:24:31.405752482 +0200
|
||||
+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt 2012-05-06 19:22:12.544657204 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
${TDE_INCLUDE_DIR}
|
||||
${TQT_INCLUDE_DIRS}
|
||||
${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
|
||||
- /usr/include/poppler
|
||||
+ ${POPPLER_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
link_directories(
|
||||
@ -1,16 +0,0 @@
|
||||
diff -Nuar kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake kdegraphics/kpovmodeler/ConfigureChecks.cmake
|
||||
--- kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake 2011-05-11 22:40:19.000000000 +0200
|
||||
+++ kdegraphics/kpovmodeler/ConfigureChecks.cmake 2011-10-30 14:00:54.000000000 +0100
|
||||
@@ -12,7 +12,10 @@
|
||||
# glu
|
||||
pkg_search_module( GLU glu )
|
||||
if( NOT GLU_FOUND )
|
||||
- tde_message_fatal( "glu is required, but was not found on your system" )
|
||||
+ check_include_file ( GL/glu.h HAVE_GLU )
|
||||
+ if( NOT HAVE_GLU )
|
||||
+ tde_message_fatal( "glu is required, but was not found on your system" )
|
||||
+ endif ( )
|
||||
endif( )
|
||||
|
||||
|
||||
kfile-plugins/dependencies/poppler-tqt/CMakeFiles/poppler-tqt-shared.dir/build.make
|
||||
@ -1,10 +0,0 @@
|
||||
--- kdegraphics/kpovmodeler/ConfigureChecks.cmake.ORI 2011-11-02 21:57:05.000000000 +0100
|
||||
+++ kdegraphics/kpovmodeler/ConfigureChecks.cmake 2011-11-02 21:57:49.000000000 +0100
|
||||
@@ -16,6 +16,7 @@
|
||||
if( NOT HAVE_GLU )
|
||||
tde_message_fatal( "glu is required, but was not found on your system" )
|
||||
endif ( )
|
||||
+ set( GLU_LIBRARIES "-lGL -lGLU" )
|
||||
endif( )
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Nuar kdegraphics.ORI/ksnapshot/CMakeLists.txt kdegraphics/ksnapshot/CMakeLists.txt
|
||||
--- kdegraphics.ORI/ksnapshot/CMakeLists.txt 2011-05-11 23:29:40.000000000 +0200
|
||||
+++ kdegraphics/ksnapshot/CMakeLists.txt 2011-10-31 15:45:47.107958154 +0100
|
||||
@@ -40,6 +40,6 @@
|
||||
SOURCES
|
||||
ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp
|
||||
windowgrabber.cpp ksnapshotwidget.ui
|
||||
- LINK kdeprint-shared
|
||||
+ LINK kdeprint-shared Xext
|
||||
DESTINATION ${BIN_INSTALL_DIR}
|
||||
)
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdegraphics.ORI/kpdf/xpdf/aconf.h 2011-04-27 19:32:57.000000000 +0200
|
||||
+++ kdegraphics/kpdf/xpdf/aconf.h 2011-10-30 14:54:24.000000000 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
#define HAVE_FREETYPE_FREETYPE_H HAVE_FREETYPE
|
||||
#define OPI_SUPPORT 0
|
||||
#define TEXTOUT_WORD_LIST 0
|
||||
-#define HAVE_MKSTEMPS 1 //libkdefakes provides it
|
||||
+#define HAVE_MKSTEMPS 0
|
||||
#define HAVE_SPLASH 1
|
||||
#define SPLASH_CMYK 1
|
||||
#define HAVE_XPDFCORE 0
|
||||
@ -1,12 +0,0 @@
|
||||
--- kdegraphics-3.5.13.1/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake.ORI 2012-10-14 15:03:54.880338162 +0200
|
||||
+++ kdegraphics-3.5.13.1/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake 2012-10-14 15:04:12.400975329 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/lib
|
||||
-includedir=${prefix}/include/kde
|
||||
+libdir=@LIB_INSTALL_DIR@
|
||||
+includedir=@INCLUDE_INSTALL_DIR@
|
||||
|
||||
Name: poppler-tqt
|
||||
Description: TQt bindings for poppler
|
||||
@ -1,38 +0,0 @@
|
||||
--- kdegraphics-3.5.13.1/kgamma/ConfigureChecks.cmake.ORI 2012-10-10 21:25:24.204928664 +0200
|
||||
+++ kdegraphics-3.5.13.1/kgamma/ConfigureChecks.cmake 2012-10-10 21:26:51.812154610 +0200
|
||||
@@ -11,10 +11,10 @@
|
||||
|
||||
include( CheckIncludeFileCXX )
|
||||
|
||||
pkg_search_module( XXF86VM xxf86vm )
|
||||
if( NOT XXF86VM_FOUND )
|
||||
- tde_message_fatal( "xxf86vm is required, but was not found on your system" )
|
||||
+ set( XXF86VM_LIBRARIES "-lXxf86vm" )
|
||||
endif( )
|
||||
|
||||
tde_save( CMAKE_REQUIRED_INCLUDES )
|
||||
set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
|
||||
--- kdegraphics-3.5.13.1/kpovmodeler/ConfigureChecks.cmake.ORI 2012-10-10 21:33:43.491841294 +0200
|
||||
+++ kdegraphics-3.5.13.1/kpovmodeler/ConfigureChecks.cmake 2012-10-10 21:34:11.245282172 +0200
|
||||
@@ -23,5 +23,5 @@
|
||||
# xmu
|
||||
pkg_search_module( XMU xmu )
|
||||
if( NOT XMU_FOUND )
|
||||
- tde_message_fatal( "xmu is required, but was not found on your system" )
|
||||
+ set( XMU_LIBRARIES "-lXmu" )
|
||||
endif( )
|
||||
--- kdegraphics-3.5.13.1/ksvg/plugin/backends/libart/GlyphTracerLibart.cpp.ORI 2012-10-11 22:17:26.285831149 +0200
|
||||
+++ kdegraphics-3.5.13.1/ksvg/plugin/backends/libart/GlyphTracerLibart.cpp 2012-10-11 22:17:31.815712301 +0200
|
||||
@@ -31,11 +31,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
-#ifdef HAVE_FREETYPE_2_2_x
|
||||
- #define FT_VECTOR_PARAMETER const FT_Vector
|
||||
-#else
|
||||
- #define FT_VECTOR_PARAMETER FT_Vector
|
||||
-#endif
|
||||
+#define FT_VECTOR_PARAMETER FT_Vector
|
||||
|
||||
using namespace T2P;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue