Hello community, here is the log from the commit of package kdegraphics3 for openSUSE:Factory checked in at 2012-05-07 22:46:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegraphics3 (Old) and /work/SRC/openSUSE:Factory/.kdegraphics3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdegraphics3", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegraphics3/kdegraphics3.changes 2012-03-26 11:01:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdegraphics3.new/kdegraphics3.changes 2012-05-07 22:47:35.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 28 19:13:22 UTC 2012 - [email protected] + +- build without fpermissive + +------------------------------------------------------------------- New: ---- kdegraphics-3.5.13-fix_gcc47_compilation.patch kdegraphics-trinity-temporary.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics3.spec ++++++ --- /var/tmp/diff_new_pack.f8IpqX/_old 2012-05-07 22:47:36.000000000 +0200 +++ /var/tmp/diff_new_pack.f8IpqX/_new 2012-05-07 22:47:36.000000000 +0200 @@ -75,6 +75,8 @@ %endif Patch15: GSmartPointer-gcc46.patch Patch16: kdegraphics-trinity-kpdf-rotate.diff +Patch17: kdegraphics-3.5.13-fix_gcc47_compilation.patch +Patch18: kdegraphics-trinity-temporary.patch Requires: ghostscript-x11 %if 0%{?suse_version} <= 1120 Provides: kdegraphics3-viewer:/opt/kde3/bin/kuickshow @@ -271,6 +273,8 @@ %endif %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 # gift is not maintained anymore and broken rm -rf kmrml @@ -280,7 +284,7 @@ %build export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" . /etc/opt/kde3/common_options -export CXXFLAGS="-I/usr/include/agg2/ $CXXFLAGS -fpermissive" +export CXXFLAGS="-I/usr/include/agg2/ $CXXFLAGS" %if 0%{?suse_version} > 1140 sed -i 's|DO_NOT_COMPILE ksvg|DO_NOT_COMPILE|g' configure sed -i 's|as-needed|no-as-needed|g' configure ++++++ kdegraphics-3.5.13-fix_gcc47_compilation.patch ++++++ --- 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 @@ QDomElement 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 ++++++ kdegraphics-trinity-temporary.patch ++++++ >From 31c447f30b1c4804e25f2579d65c5678ee5b3b79 Mon Sep 17 00:00:00 2001 From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> Date: Tue, 11 Oct 2011 06:27:20 +0000 Subject: Fix reference to temporary in kdegraphics git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1258283 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- (limited to 'kviewshell/documentWidget.cpp') diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index f92da79..f370dab 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -287,7 +287,8 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) if (KVSPrefs::changeColors() && KVSPrefs::renderMode() != KVSPrefs::EnumRenderMode::Paper) { // Paint widget contents with accessibility changes. - bitBlt ( this, destRect.topLeft(), &pageData->accessiblePixmap(), pixmapRect, CopyROP); + QPixmap pdap = pageData->accessiblePixmap(); + bitBlt ( this, destRect.topLeft(), &pdap, pixmapRect, CopyROP); } else { -- cgit v0.9.0.2-39-g756e -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
