svn commit: r312302 - head/graphics/kdegraphics3/files
Pawel Pekala
pawel at FreeBSD.org
Fri Feb 15 17:24:35 UTC 2013
Author: pawel
Date: Fri Feb 15 17:24:34 2013
New Revision: 312302
URL: http://svnweb.freebsd.org/changeset/ports/312302
Log:
Fix build with clang, patches from NetBSD pkgsrc
PR: ports/175634
Submitted by: Oliver Pinter <oliver.pntr at gmail.com>
Added:
head/graphics/kdegraphics3/files/patch-configure (contents, props changed)
head/graphics/kdegraphics3/files/patch-kmrml_kmrml_mrml__elements.h (contents, props changed)
head/graphics/kdegraphics3/files/patch-kviewshell_documentWidget.cpp (contents, props changed)
head/graphics/kdegraphics3/files/patch-kviewshell_plugins_djvu_libdjvu_GContainer.h (contents, props changed)
Added: head/graphics/kdegraphics3/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/kdegraphics3/files/patch-configure Fri Feb 15 17:24:34 2013 (r312302)
@@ -0,0 +1,17 @@
+--- configure.orig 2013-02-15 17:32:14.000000000 +0100
++++ configure 2013-02-15 17:33:04.000000000 +0100
+@@ -35743,11 +35743,11 @@
+
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compile='$CXX -c $CXXFLAGS $USE_EXCEPTIONS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $USE_EXCEPTIONS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $USE_EXCEPTIONS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+
+
+ kde_save_CXXFLAGS="$CXXFLAGS"
Added: head/graphics/kdegraphics3/files/patch-kmrml_kmrml_mrml__elements.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/kdegraphics3/files/patch-kmrml_kmrml_mrml__elements.h Fri Feb 15 17:24:34 2013 (r312302)
@@ -0,0 +1,11 @@
+--- kmrml/kmrml/mrml_elements.h.orig 2012-06-18 18:08:26.000000000 +0000
++++ kmrml/kmrml/mrml_elements.h
+@@ -157,7 +157,7 @@ namespace KMrml
+ QDomElement elem = list.item( i ).toElement();
+ t item( elem );
+ if ( item.isValid() )
+- append( item );
++ this->append( item );
+ }
+ }
+
Added: head/graphics/kdegraphics3/files/patch-kviewshell_documentWidget.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/kdegraphics3/files/patch-kviewshell_documentWidget.cpp Fri Feb 15 17:24:34 2013 (r312302)
@@ -0,0 +1,12 @@
+--- kviewshell/documentWidget.cpp.orig 2012-06-18 18:22:45.000000000 +0000
++++ kviewshell/documentWidget.cpp
+@@ -287,7 +287,8 @@ void DocumentWidget::paintEvent(QPaintEv
+ if (KVSPrefs::changeColors() && KVSPrefs::renderMode() != KVSPrefs::EnumRenderMode::Paper)
+ {
+ // Paint widget contents with accessibility changes.
+- bitBlt ( this, destRect.topLeft(), &pageData->accessiblePixmap(), pixmapRect, CopyROP);
++ QPixmap p(pageData->accessiblePixmap());
++ bitBlt ( this, destRect.topLeft(), &p, pixmapRect, CopyROP);
+ }
+ else
+ {
Added: head/graphics/kdegraphics3/files/patch-kviewshell_plugins_djvu_libdjvu_GContainer.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/kdegraphics3/files/patch-kviewshell_plugins_djvu_libdjvu_GContainer.h Fri Feb 15 17:24:34 2013 (r312302)
@@ -0,0 +1,236 @@
+--- kviewshell/plugins/djvu/libdjvu/GContainer.h.orig 2012-06-18 18:24:59.000000000 +0000
++++ kviewshell/plugins/djvu/libdjvu/GContainer.h
+@@ -152,6 +152,86 @@ namespace DJVU {
+ // Cf section 5.4.7 in november 1997 draft.
+ #pragma warning( disable : 4243 )
+ #endif
++// ------------------------------------------------------------
++// 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];
++}
+
+
+ // GPEnabled inhertenced removed again so the code works on more machines.
+@@ -887,21 +967,21 @@ public:
+ /** 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
+@@ -1122,7 +1202,7 @@ GMapImpl<K,TI>::GMapImpl(const GCONT Tra
+ 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 +1211,7 @@ GMapImpl<K,TI>::get_or_create(const K &k
+ 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 +1277,13 @@ public:
+ 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,86 +1346,6 @@ public:
+ };
+
+
+-// ------------------------------------------------------------
+-// 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];
+-}
+
+
+ //@}
More information about the svn-ports-head
mailing list