From 2b16f5c5f91f6e90ca6b627daad11cb635dbaed8 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 2 Aug 2012 11:19:58 +0200 Subject: Mageia 2: add support for MGA2 build in redhat packages --- ...-3.5.13-add_ability_to_set_kled_off_color.patch | 100 +++++++ ....5.13-add_readonly_to_tde_application.patch.ORI | 178 +++++++++++ ...kioslave_not_parsing_large_image_properly.patch | 171 +++++++++++ ...3-fix_spinbox_text_entry_when_base_not_10.patch | 35 +++ ...store_tdesu_keeppassword_default_disabled.patch | 21 ++ ...te_iso_kioslave_better_handle_large_image.patch | 115 ++++++++ redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 326 ++++++++++++--------- 7 files changed, 800 insertions(+), 146 deletions(-) create mode 100644 redhat/kdelibs/kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch create mode 100644 redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch.ORI create mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch create mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch create mode 100644 redhat/kdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch create mode 100644 redhat/kdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch (limited to 'redhat/kdelibs') diff --git a/redhat/kdelibs/kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch b/redhat/kdelibs/kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch new file mode 100644 index 000000000..bdaac75ad --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch @@ -0,0 +1,100 @@ +commit 513ffc6edff67b5f7f121c3064b059ce82cbb842 +Author: Timothy Pearson +Date: 1341187933 -0500 + + Add ability to set KLed off color + +diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp +index 3a3aa2a..dc245cd 100644 +--- a/kdeui/kled.cpp ++++ b/kdeui/kled.cpp +@@ -536,6 +536,12 @@ KLed::color() const + return led_color; + } + ++TQColor ++KLed::offColor() const ++{ ++ return led_off_color; ++} ++ + KLed::Look + KLed::look() const + { +@@ -581,6 +587,17 @@ KLed::setColor(const TQColor& col) + } + + void ++KLed::setOffColor(const TQColor& col) ++{ ++ if(led_off_color!=col) { ++ if(d->on_map) { delete d->on_map; d->on_map = 0; } ++ if(d->off_map) { delete d->off_map; d->off_map = 0; } ++ d->offcolor = col; ++ update(); ++ } ++} ++ ++void + KLed::setDarkFactor(int darkfactor) + { + if (d->dark_factor != darkfactor) { +diff --git a/kdeui/kled.h b/kdeui/kled.h +index 7b9f327..b4f828e 100644 +--- a/kdeui/kled.h ++++ b/kdeui/kled.h +@@ -50,6 +50,7 @@ class TDEUI_EXPORT KLed : public TQWidget + Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape ) + Q_PROPERTY( Look look READ look WRITE setLook ) + Q_PROPERTY( TQColor color READ color WRITE setColor ) ++ Q_PROPERTY( TQColor offColor READ color WRITE setOffColor ) + Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor ) + + public: +@@ -148,6 +149,14 @@ public: + TQColor color() const; + + /** ++ * Returns the off color of the widget ++ * ++ * @see OffColor ++ * @short Returns LED off color. ++ */ ++ TQColor offColor() const; ++ ++ /** + * Returns the look of the widget. + * + * @see Look +@@ -204,6 +213,23 @@ public: + void setColor(const TQColor& color); + + /** ++ * Set the off color of the widget. ++ * The Color is shown with the KLed::On state. ++ * The KLed::Off state is shown with this color if set ++ * ++ * The widget calls the update() method, so it will ++ * be updated when entering the main event loop. ++ * ++ * Note that calling setColor will override this value ++ * ++ * @see Color ++ * ++ * @param color New off color of the LED. ++ * @short Sets the LED off color. ++ */ ++ void setOffColor(const TQColor& color); ++ ++ /** + * Sets the factor to darken the LED in OFF state. + * Same as TQColor::dark(). + * "darkfactor should be greater than 100, else the LED gets lighter +@@ -316,6 +342,7 @@ protected: + private: + State led_state; + TQColor led_color; ++ TQColor led_off_color; + Look led_look; + Shape led_tqshape; + diff --git a/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch.ORI b/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch.ORI new file mode 100644 index 000000000..a249f1733 --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-add_readonly_to_tde_application.patch.ORI @@ -0,0 +1,178 @@ +commit d3a9d56143cf668c7d29b26a324a424d02036371 +Author: Timothy Pearson +Date: 1337109016 -0500 + + Add the ability to force read-only configuration file access in a TDE application + Force kde-config to use read-only access + This closes Bug 293 + +diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp +index 9ee9dd6..4ad0e5f 100644 +--- a/kdecore/kconfigbackend.cpp ++++ b/kdecore/kconfigbackend.cpp +@@ -247,17 +247,22 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName, + mfileName = _fileName; + resType = _resType; + useKDEGlobals = _useKDEGlobals; +- if (mfileName.isEmpty()) ++ if (mfileName.isEmpty()) { + mLocalFileName = TQString::null; +- else if (!TQDir::isRelativePath(mfileName)) ++ } ++ else if (!TQDir::isRelativePath(mfileName)) { + mLocalFileName = mfileName; +- else +- mLocalFileName = KGlobal::dirs()->saveLocation(resType) + mfileName; ++ } ++ else { ++ mLocalFileName = KGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName; ++ } + +- if (useKDEGlobals) ++ if (useKDEGlobals) { + mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals"); +- else ++ } ++ else { + mGlobalFileName = TQString::null; ++ } + + d->localLastModified = TQDateTime(); + d->localLastSize = 0; +diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp +index 9ad6600..c5c0a4e 100644 +--- a/kdecore/kconfigbase.cpp ++++ b/kdecore/kconfigbase.cpp +@@ -1139,16 +1139,18 @@ static TQString translatePath( TQString path ) + + // return original path, if it refers to another type of URL (e.g. http:/), or + // if the path is already relative to another directory +- if (!startsWithFile && path[0] != '/' || +- startsWithFile && path[5] != '/') ++ if (((!startsWithFile) && (path[0] != '/')) || (startsWithFile && (path[5] != '/'))) { + return path; ++ } + +- if (startsWithFile) ++ if (startsWithFile) { + path.remove(0,5); // strip leading "file:/" off the string ++ } + + // keep only one single '/' at the beginning - needed for cleanHomeDirPath() +- while (path[0] == '/' && path[1] == '/') ++ while (path[0] == '/' && path[1] == '/') { + path.remove(0,1); ++ } + + // we can not use KGlobal::dirs()->relativeLocation("home", path) here, + // since it would not recognize paths without a trailing '/'. +diff --git a/kdecore/kinstance.cpp b/kdecore/kinstance.cpp +index fe0a515..5b3aa86 100644 +--- ./kdecore/kinstance.cpp.orig 2011-08-11 04:30:15.000000000 +0200 ++++ ./kdecore/kinstance.cpp 2012-06-18 23:34:55.942376042 +0200 +@@ -70,7 +70,7 @@ + : _dirs (0L), + _config (0L), + _iconLoader (0L), +- _name( name ), _aboutData( new KAboutData( name, "", 0 ) ) ++ _name( name ), _aboutData( new KAboutData( name, "", 0 ) ), m_configReadOnly(false) + { + DEBUG_ADD + Q_ASSERT(!name.isEmpty()); +@@ -88,7 +88,7 @@ + : _dirs (0L), + _config (0L), + _iconLoader (0L), +- _name( aboutData->appName() ), _aboutData( aboutData ) ++ _name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false) + { + DEBUG_ADD + Q_ASSERT(!_name.isEmpty()); +@@ -107,7 +107,7 @@ + : _dirs ( src->_dirs ), + _config ( src->_config ), + _iconLoader ( src->_iconLoader ), +- _name( src->_name ), _aboutData( src->_aboutData ) ++ _name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false) + { + DEBUG_ADD + Q_ASSERT(!_name.isEmpty()); +@@ -174,6 +174,11 @@ + extern bool kde_kiosk_exception; + extern bool kde_kiosk_admin; + ++void KInstance::setConfigReadOnly(bool ro) ++{ ++ m_configReadOnly = ro; ++} ++ + KConfig *KInstance::config() const + { + DEBUG_CHECK_ALIVE +@@ -199,7 +204,7 @@ + if ( d->sharedConfig == 0 ) + { + if ( !_name.isEmpty() ) +- d->sharedConfig = KSharedConfig::openConfig( _name + "rc"); ++ d->sharedConfig = KSharedConfig::openConfig( _name + "rc"), m_configReadOnly; + else + d->sharedConfig = KSharedConfig::openConfig( TQString::null ); + } +diff --git a/kdecore/kinstance.h b/kdecore/kinstance.h +index 75cc4b4..444a2d8 100644 +--- a/kdecore/kinstance.h ++++ b/kdecore/kinstance.h +@@ -96,6 +96,14 @@ class kdecore_EXPORT KInstance + KSharedConfig *sharedConfig() const; + + /** ++ * Set a read-only flag on the configuration files ++ * This must be called before config() or dirs() to have any effect ++ * Defaults to FALSE ++ * @param ro read only if TRUE ++ */ ++ void setConfigReadOnly(bool ro); ++ ++ /** + * Returns an iconloader object. + * @return the iconloader object. + */ +@@ -162,6 +170,7 @@ protected: + virtual void virtual_hook( int id, void* data ); + private: + KInstancePrivate *d; ++ bool m_configReadOnly; + }; + + #endif +diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp +index bce4bf4..bb8ae97 100644 +--- ./kdecore/kstandarddirs.cpp.orig 2011-08-21 06:15:32.000000000 +0200 ++++ ./kdecore/kstandarddirs.cpp 2012-06-18 23:46:56.765409982 +0200 +@@ -767,8 +766,12 @@ + srv = findExe(TQString::tqfromLatin1("lnusertemp")); + if (!srv.isEmpty()) + { +- system(TQFile::encodeName(srv)+" "+type); +- result = readlink(TQFile::encodeName(dir).data(), link, 1023); ++ if (system(TQFile::encodeName(srv)+" "+type) < 0 ) { ++ result = readlink(TQFile::encodeName(dir).data(), link, 1023); ++ } ++ else { ++ result = -1; ++ } + } + } + if (result > 0) +diff --git a/kdecore/kde-config.cpp.in b/kdecore/kde-config.cpp.in +index 90c5dae..c988b00 100644 +--- a/kdecore/kde-config.cpp.in ++++ b/kdecore/kde-config.cpp.in +@@ -120,6 +120,7 @@ int main(int argc, char **argv) + KCmdLineArgs::addCmdLineOptions( options ); // Add my own options. + + KInstance a("kde-config"); ++ a.setConfigReadOnly(TRUE); + (void)KGlobal::dirs(); // trigger the creation + (void)KGlobal::config(); + diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch new file mode 100644 index 000000000..f55310ed8 --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch @@ -0,0 +1,171 @@ +commit b4bba7b553995a6b13214dbbabe18ff311007eea +Author: Timothy Pearson +Date: 1341113466 -0500 + + Fix iso kioslave not parsing large images properly + +diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp +index c6faa65..6403f62 100644 +--- a/kioslave/iso/kiso.cpp ++++ b/kioslave/iso/kiso.cpp +@@ -188,7 +188,7 @@ KIso::~KIso() + } + + /* callback function for libisofs */ +-static int readf(char *buf, int start, int len,void *udata) { ++static int readf(char *buf, long start, long len,void *udata) { + + TQIODevice* dev = ( static_cast (udata) )->device(); + +@@ -212,7 +212,7 @@ static int mycallb(struct iso_directory_record *idr,void *udata) { + bool special=false; + KArchiveEntry *entry=NULL,*oldentry=NULL; + char z_algo[2],z_params[2]; +- int z_size=0; ++ long long z_size=0; + + if ((idr->flags[0] & 1) && !iso->showhidden) return 0; + if (iso->level) { +@@ -289,7 +289,8 @@ static int mycallb(struct iso_directory_record *idr,void *udata) { + + void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) { + +- int i,size; ++ int i; ++ long long size; + boot_head boot; + boot_entry *be; + TQString path; +diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp +index afac16b..ffae0d3 100644 +--- a/kioslave/iso/kisofile.cpp ++++ b/kioslave/iso/kisofile.cpp +@@ -20,7 +20,7 @@ + + KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access, + int date, int adate,int cdate, const TQString& user, const TQString& group, +- const TQString& symlink,int pos, int size) : ++ const TQString& symlink,long long pos, long long size) : + KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) { + + +@@ -32,7 +32,7 @@ KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access, + KIsoFile::~KIsoFile(){ + } + +-void KIsoFile::setZF(char algo[2],char parms[2],int realsize) { ++void KIsoFile::setZF(char algo[2],char parms[2],long long realsize) { + m_algo[0]=algo[0];m_algo[1]=algo[1]; + m_parms[0]=parms[0];m_parms[1]=parms[1]; + m_realsize=realsize; +diff --git a/kioslave/iso/kisofile.h b/kioslave/iso/kisofile.h +index 193509c..696a8c1 100644 +--- a/kioslave/iso/kisofile.h ++++ b/kioslave/iso/kisofile.h +@@ -29,9 +29,9 @@ class KIsoFile : public KArchiveFile { + public: + KIsoFile( KArchive* archive, const TQString& name, int access, int date, + int adate,int cdate, const TQString& user, const TQString& group, +- const TQString& symlink, int pos, int size); ++ const TQString& symlink, long long pos, long long size); + ~KIsoFile(); +- void setZF(char algo[2],char parms[2],int realsize); ++ void setZF(char algo[2],char parms[2],long long realsize); + int adate() const { return m_adate; } + int cdate() const { return m_cdate; } + long long realsize() const { return m_realsize; } +diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c +index ab13d9e..e599450 100644 +--- a/kioslave/iso/libisofs/isofs.c ++++ b/kioslave/iso/libisofs/isofs.c +@@ -122,8 +122,8 @@ void FreeBootTable(boot_head *boot) { + boot->defentry=NULL; + } + +-int BootImageSize(int media,int len) { +- int ret; ++int BootImageSize(int media,long len) { ++ long long ret; + + switch(media & 0xf) { + case 0: +@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) { + return entry; + } + +-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) { ++int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) { + + char buf[2048], *c, *be; + int i,end=0; +@@ -221,7 +221,7 @@ err: + /** + * Creates the linked list of the volume descriptors + */ +-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata) { ++iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) { + + int i; + struct iso_volume_descriptor buf; +@@ -577,10 +577,10 @@ int level=0,joliet=0,dirs,files; + iconv_t iconv_d; + int fd; + +-int readf(char *buf, int start, int len,void *udata) { ++int readf(char *buf, long start, long len,void *udata) { + int ret; + +- if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret; ++ if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret; + ret=read(fd, buf, len << 11); + if (ret<0) return ret; + return (ret >> 11); +diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h +index 52190e6..b8971a4 100644 +--- a/kioslave/iso/libisofs/isofs.h ++++ b/kioslave/iso/libisofs/isofs.h +@@ -50,7 +50,7 @@ typedef struct _rr_entry { + int re; /* relocated */ + char z_algo[2]; /* zizofs algorithm */ + char z_params[2]; /* zizofs parameters */ +- int z_size; /* zizofs real_size */ ++ long z_size; /* zizofs real_size */ + } rr_entry; + + typedef struct _iso_vol_desc { +@@ -78,7 +78,7 @@ typedef struct _boot_head { + /** + * this callback function needs to read 'len' sectors from 'start' into 'buf' + */ +-typedef int readfunc(char *buf,int start, int len,void *); ++typedef int readfunc(char *buf,long start, long len,void *); + + /** + * ProcessDir uses this callback +@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs); + * If the function fails, returns NULL + * Don't forget to call FreeISO9660 after using the volume descriptor list! + */ +-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata); ++iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata); + + /** + * Frees the linked list of volume descriptors +@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd); + /** + * Returns the size of the boot image (in 512 byte sectors) + */ +-int BootImageSize(int media,int len); ++int BootImageSize(int media,long len); + + /** + * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable, +@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot); + /** + * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable! + */ +-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata); ++int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata); + + #ifdef __cplusplus + } //extern "C" diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch new file mode 100644 index 000000000..9a34f74db --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch @@ -0,0 +1,35 @@ +commit d1c71f692f5329dbfe817bbed41c5137be608efa +Author: Timothy Pearson +Date: 1341199632 -0500 + + Fix spinbox text entry when base is not 10 + +diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp +index 27b86f9..118af6c 100644 +--- a/kdeui/knuminput.cpp ++++ b/kdeui/knuminput.cpp +@@ -206,6 +206,7 @@ KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name) + { + editor()->tqsetAlignment(AlignRight); + val_base = 10; ++ setValidator(new KIntValidator(this, val_base)); + setValue(0); + } + +@@ -219,11 +220,16 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base, + { + editor()->tqsetAlignment(AlignRight); + val_base = base; ++ setValidator(new KIntValidator(this, val_base)); + setValue(value); + } + + void KIntSpinBox::setBase(int base) + { ++ const KIntValidator* kvalidator = dynamic_cast(validator()); ++ if (kvalidator) { ++ const_cast(kvalidator)->setBase(base); ++ } + val_base = base; + } + diff --git a/redhat/kdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch b/redhat/kdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch new file mode 100644 index 000000000..8c3f43a11 --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch @@ -0,0 +1,21 @@ +commit 87363770ea3fe6167445b6d445ca563f2a3f05fc +Author: Darrell Anderson +Date: 1339430277 -0500 + + Restore tdesu dialog "Keep password" check box default to disabled/unchecked. + +diff --git a/tdesu/defaults.h b/tdesu/defaults.h +index 4649b2b..7fd724e 100644 +--- a/kdesu/defaults.h ++++ b/kdesu/defaults.h +@@ -13,9 +13,8 @@ + #ifndef __Defaults_h_included__ + #define __Defaults_h_included__ + +-/*const int defTimeout = 120*60;*/ + const int defTimeout = 120*60; + const int defEchoMode = 0; +-const int defKeep = true; ++const int defKeep = false; + + #endif diff --git a/redhat/kdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch b/redhat/kdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch new file mode 100644 index 000000000..601bc41ea --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch @@ -0,0 +1,115 @@ +commit dca4c677237b01768f5d6d798a2d918547d2ee8e +Author: Timothy Pearson +Date: 1341289561 -0500 + + Update iso kioslave to better handle large images + +diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp +index c9e2d43..9ec1f1c 100644 +--- a/kioslave/iso/kiso.cpp ++++ b/kioslave/iso/kiso.cpp +@@ -188,7 +188,7 @@ KIso::~KIso() + } + + /* callback function for libisofs */ +-static int readf(char *buf, long start, long len,void *udata) { ++static int readf(char *buf, long long start, long long len,void *udata) { + + TQIODevice* dev = ( static_cast (udata) )->device(); + +diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c +index e599450..f1db442 100644 +--- a/kioslave/iso/libisofs/isofs.c ++++ b/kioslave/iso/libisofs/isofs.c +@@ -122,7 +122,7 @@ void FreeBootTable(boot_head *boot) { + boot->defentry=NULL; + } + +-int BootImageSize(int media,long len) { ++int BootImageSize(int media,long long len) { + long long ret; + + switch(media & 0xf) { +@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) { + return entry; + } + +-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) { ++int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata) { + + char buf[2048], *c, *be; + int i,end=0; +@@ -221,7 +221,7 @@ err: + /** + * Creates the linked list of the volume descriptors + */ +-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) { ++iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata) { + + int i; + struct iso_volume_descriptor buf; +@@ -577,7 +577,7 @@ int level=0,joliet=0,dirs,files; + iconv_t iconv_d; + int fd; + +-int readf(char *buf, long start, long len,void *udata) { ++int readf(char *buf, long long start, long long len,void *udata) { + int ret; + + if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret; +diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h +index b8971a4..1d17de4 100644 +--- a/kioslave/iso/libisofs/isofs.h ++++ b/kioslave/iso/libisofs/isofs.h +@@ -50,13 +50,13 @@ typedef struct _rr_entry { + int re; /* relocated */ + char z_algo[2]; /* zizofs algorithm */ + char z_params[2]; /* zizofs parameters */ +- long z_size; /* zizofs real_size */ ++ long long z_size; /* zizofs real_size */ + } rr_entry; + + typedef struct _iso_vol_desc { + struct _iso_vol_desc *next; + struct _iso_vol_desc *prev; +- struct iso_volume_descriptor data; ++ struct iso_volume_descriptor data; + } iso_vol_desc; + + typedef struct _boot_entry { +@@ -78,7 +78,7 @@ typedef struct _boot_head { + /** + * this callback function needs to read 'len' sectors from 'start' into 'buf' + */ +-typedef int readfunc(char *buf,long start, long len,void *); ++typedef int readfunc(char *buf,long long start, long long len,void *); + + /** + * ProcessDir uses this callback +@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs); + * If the function fails, returns NULL + * Don't forget to call FreeISO9660 after using the volume descriptor list! + */ +-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata); ++iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata); + + /** + * Frees the linked list of volume descriptors +@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd); + /** + * Returns the size of the boot image (in 512 byte sectors) + */ +-int BootImageSize(int media,long len); ++int BootImageSize(int media,long long len); + + /** + * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable, +@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot); + /** + * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable! + */ +-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata); ++int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata); + + #ifdef __cplusplus + } //extern "C" diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 85e6f5e05..89e939507 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -1,16 +1,23 @@ # 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 %{_datadir}/doc %endif # TDE 3.5.13 specific variables -%define tde_docdir %{_docdir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{_prefix}/bin +%define tde_datadir %{_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{_prefix}/include +%define tde_libdir %{_prefix}/%{_lib} + +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-tdelibs Version: 3.5.13 -Release: 10%{?dist}%{?_variant} +Release: 11%{?dist}%{?_variant} License: GPL Summary: TDE Libraries Group: Environment/Libraries @@ -71,12 +78,21 @@ Patch27: kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch Patch28: kdelibs-3.5.13-fix_build_kspell2.patch ## [tdelibs] Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7] Patch29: kdelibs-3.5.13-fix_iso_kioslave.patch +## [tdelibs] Fix iso kioslave not parsing large images properly [Commit #b4bba7b5] +Patch30: kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch +## [tdelibs] Add ability to set KLed off color [Commit #513ffc6e] +Patch31: kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch +## [tdelibs] Fix spinbox text entry when base is not 10 [Commit #d1c71f69] +Patch32: kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch +## [tdelibs] Update iso kioslave to better handle large images [Commit #dca4c677] +Patch33: kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch +## [tdelibs] Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770] +Patch34: kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch BuildRequires: cmake >= 2.8 BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel -BuildRequires: avahi-devel BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel BuildRequires: libutempter-devel BuildRequires: bzip2-devel @@ -85,25 +101,34 @@ BuildRequires: gcc-c++ BuildRequires: alsa-lib-devel BuildRequires: libidn-devel BuildRequires: qt3-devel -BuildRequires: avahi-qt3-devel BuildRequires: jasper-devel BuildRequires: libtiff-devel BuildRequires: OpenEXR-devel -BuildRequires: libtool-ltdl-devel BuildRequires: glib2-devel BuildRequires: gamin-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: libXcomposite-devel BuildRequires: aspell-devel BuildRequires: hspell-devel +BuildRequires: avahi-tqt-devel >= 3.5.13 # LUA support are not ready yet #BuildRequires: lua-devel -Requires: tqtinterface -Requires: trinity-arts +%if 0%{?mgaversion} +BuildRequires: %{_lib}avahi-client-devel +BuildRequires: %{_lib}ltdl-devel +BuildRequires: x11-proto-devel +BuildRequires: %{_lib}xcomposite1-devel +Requires: %{_lib}avahi-client3 +%else +BuildRequires: avahi-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: libXcomposite-devel +%endif + +Requires: tqtinterface >= 3.5.13 +Requires: trinity-arts >= 3.5.13 Requires: avahi -Requires: qt3 -Requires: avahi-qt3 +Requires: qt3 >= 3.3.8.d %description Libraries for the Trinity Desktop Environment: @@ -115,103 +140,103 @@ kimgio (image manipulation). %files %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO -%{_bindir}/artsmessage -%{_bindir}/cupsdconf -%{_bindir}/cupsdoprint -%{_bindir}/dcop -%{_bindir}/dcopclient -%{_bindir}/dcopfind -%{_bindir}/dcopobject -%{_bindir}/dcopquit -%{_bindir}/dcopref -%{_bindir}/dcopserver -%{_bindir}/dcopserver_shutdown -%{_bindir}/dcopstart -%{_bindir}/filesharelist -%{_bindir}/fileshareset -%{_bindir}/imagetops -%{_bindir}/kab2kabc -%{_bindir}/kaddprinterwizard -%{_bindir}/kbuildsycoca -%{_bindir}/kcmshell -%{_bindir}/kconf_update -%{_bindir}/kcookiejar -%{_bindir}/kde-config -%{_bindir}/kde-menu -%{_bindir}/kded -%{_bindir}/kdeinit -%{_bindir}/kdeinit_shutdown -%{_bindir}/kdeinit_wrapper -%{_bindir}/kdesu_stub -%{_bindir}/kdontchangethehostname -%{_bindir}/kdostartupconfig -%{_bindir}/kfile -%{_bindir}/kfmexec -%{_bindir}/khotnewstuff -%{_bindir}/kinstalltheme -%{_bindir}/kio_http_cache_cleaner -%{_bindir}/kio_uiserver -%{_bindir}/kioexec -%{_bindir}/kioslave -%{_bindir}/klauncher -%{_bindir}/kmailservice -%{_bindir}/kmimelist -%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper -%{_bindir}/ksendbugmail -%{_bindir}/kshell -%{_bindir}/kstartupconfig -%{_bindir}/ktelnetservice -%{_bindir}/ktradertest -%{_bindir}/kwrapper -%{_bindir}/lnusertemp -%{_bindir}/make_driver_db_cups -%{_bindir}/make_driver_db_lpr -%{_bindir}/meinproc -%{_bindir}/networkstatustestservice -%{_bindir}/start_kdeinit -%{_bindir}/start_kdeinit_wrapper -%attr(4755,root,root) %{_bindir}/kgrantpty -%{_libdir}/lib*.so.* -%{_libdir}/lib[kt]deinit_*.la -%{_libdir}/lib[kt]deinit_*.so -%{tde_libdir}/ -%{_datadir}/applications/kde/*.desktop -%{_datadir}/autostart/kab2kabc.desktop -%{_datadir}/applnk/kio_iso.desktop -%{_datadir}/apps/* -%exclude %{_datadir}/apps/ksgmltools2/ -%config(noreplace) %{_datadir}/config/* -%{_datadir}/emoticons/* -%{_datadir}/icons/default.kde -%{_datadir}/mimelnk/magic -%{_datadir}/mimelnk/*/*.desktop -%{_datadir}/services/* -%{_datadir}/servicetypes/* -%{_datadir}/icons/crystalsvg/ -%{tde_docdir}/HTML/en/kspell +%{tde_bindir}/artsmessage +%{tde_bindir}/cupsdconf +%{tde_bindir}/cupsdoprint +%{tde_bindir}/dcop +%{tde_bindir}/dcopclient +%{tde_bindir}/dcopfind +%{tde_bindir}/dcopobject +%{tde_bindir}/dcopquit +%{tde_bindir}/dcopref +%{tde_bindir}/dcopserver +%{tde_bindir}/dcopserver_shutdown +%{tde_bindir}/dcopstart +%{tde_bindir}/filesharelist +%{tde_bindir}/fileshareset +%{tde_bindir}/imagetops +%{tde_bindir}/kab2kabc +%{tde_bindir}/kaddprinterwizard +%{tde_bindir}/kbuildsycoca +%{tde_bindir}/kcmshell +%{tde_bindir}/kconf_update +%{tde_bindir}/kcookiejar +%{tde_bindir}/kde-config +%{tde_bindir}/kde-menu +%{tde_bindir}/kded +%{tde_bindir}/kdeinit +%{tde_bindir}/kdeinit_shutdown +%{tde_bindir}/kdeinit_wrapper +%{tde_bindir}/kdesu_stub +%{tde_bindir}/kdontchangethehostname +%{tde_bindir}/kdostartupconfig +%{tde_bindir}/kfile +%{tde_bindir}/kfmexec +%{tde_bindir}/khotnewstuff +%{tde_bindir}/kinstalltheme +%{tde_bindir}/kio_http_cache_cleaner +%{tde_bindir}/kio_uiserver +%{tde_bindir}/kioexec +%{tde_bindir}/kioslave +%{tde_bindir}/klauncher +%{tde_bindir}/kmailservice +%{tde_bindir}/kmimelist +%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper +%{tde_bindir}/ksendbugmail +%{tde_bindir}/kshell +%{tde_bindir}/kstartupconfig +%{tde_bindir}/ktelnetservice +%{tde_bindir}/ktradertest +%{tde_bindir}/kwrapper +%{tde_bindir}/lnusertemp +%{tde_bindir}/make_driver_db_cups +%{tde_bindir}/make_driver_db_lpr +%{tde_bindir}/meinproc +%{tde_bindir}/networkstatustestservice +%{tde_bindir}/start_kdeinit +%{tde_bindir}/start_kdeinit_wrapper +%attr(4755,root,root) %{tde_bindir}/kgrantpty +%{tde_tdelibdir}/* +%{tde_libdir}/lib*.so.* +%{tde_libdir}/lib[kt]deinit_*.la +%{tde_libdir}/lib[kt]deinit_*.so +%{tde_datadir}/applications/kde/*.desktop +%{tde_datadir}/autostart/kab2kabc.desktop +%{tde_datadir}/applnk/kio_iso.desktop +%{tde_datadir}/apps/* +%exclude %{tde_datadir}/apps/ksgmltools2/ +%config(noreplace) %{tde_datadir}/config/* +%{tde_datadir}/emoticons/* +%{tde_datadir}/icons/default.kde +%{tde_datadir}/mimelnk/magic +%{tde_datadir}/mimelnk/*/*.desktop +%{tde_datadir}/services/* +%{tde_datadir}/servicetypes/* +%{tde_datadir}/icons/crystalsvg/ +%{tde_tdedocdir}/HTML/en/kspell/ # remove conflicts with kdelibs-4 %if "%{?_prefix}" != "/usr" -%{_bindir}/checkXML -%{_bindir}/ksvgtopng -%{_bindir}/kunittestmodrunner -%{_bindir}/preparetips -%{_datadir}/icons/hicolor/index.theme -%{_datadir}/locale/all_languages -%{tde_docdir}/HTML/en/common/* +%{tde_bindir}/checkXML +%{tde_bindir}/ksvgtopng +%{tde_bindir}/kunittestmodrunner +%{tde_bindir}/preparetips +%{tde_datadir}/icons/hicolor/index.theme +%{tde_datadir}/locale/all_languages +%{tde_tdedocdir}/HTML/en/common/* %{_sysconfdir}/ld.so.conf.d/trinity.conf %else -%exclude %{_bindir}/checkXML -%exclude %{_bindir}/ksvgtopng -%exclude %{_bindir}/kunittestmodrunner -%exclude %{_bindir}/preparetips -%exclude %{_datadir}/config/colors -%exclude %{_datadir}/config/kdebug.areas -%exclude %{_datadir}/config/kdebugrc -%exclude %{_datadir}/config/ksslcalist -%exclude %{_datadir}/config/ui/ui_standards.rc -%exclude %{_datadir}/icons/hicolor/index.theme -%exclude %{_datadir}/locale/all_languages -%exclude %{tde_docdir}/HTML/en/common/* +%exclude %{tde_bindir}/checkXML +%exclude %{tde_bindir}/ksvgtopng +%exclude %{tde_bindir}/kunittestmodrunner +%exclude %{tde_bindir}/preparetips +%exclude %{tde_datadir}/config/colors +%exclude %{tde_datadir}/config/kdebug.areas +%exclude %{tde_datadir}/config/kdebugrc +%exclude %{tde_datadir}/config/ksslcalist +%exclude %{tde_datadir}/config/ui/ui_standards.rc +%exclude %{tde_datadir}/icons/hicolor/index.theme +%exclude %{tde_datadir}/locale/all_languages +%exclude %{tde_tdedocdir}/HTML/en/common/* %endif # Avoid conflict with 'redhat-menus' package @@ -222,11 +247,13 @@ kimgio (image manipulation). %endif # New in TDE 3.5.13 -%{_bindir}/kdetcompmgr +%{tde_bindir}/kdetcompmgr -%post -p /sbin/ldconfig +%post +/sbin/ldconfig || : -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig || : ########## @@ -246,40 +273,25 @@ applications for TDE. %files devel %defattr(-,root,root,-) -%{_bindir}/dcopidl* -%{_bindir}/kconfig_compiler -%{_bindir}/makekdewidgets -%{_datadir}/apps/ksgmltools2/ -%{_includedir}/* -%{_libdir}/*.la -%{_libdir}/*.so -%{_libdir}/*.a -%exclude %{_libdir}/libkdeinit_*.la -%exclude %{_libdir}/libkdeinit_*.so +%{tde_bindir}/dcopidl* +%{tde_bindir}/kconfig_compiler +%{tde_bindir}/makekdewidgets +%{tde_datadir}/apps/ksgmltools2/ +%{tde_includedir}/* +%{tde_libdir}/*.la +%{tde_libdir}/*.so +%{tde_libdir}/*.a +%exclude %{tde_libdir}/libkdeinit_*.la +%exclude %{tde_libdir}/libkdeinit_*.so # New in TDE 3.5.13 -%{_datadir}/cmake/kdelibs.cmake +%{tde_datadir}/cmake/kdelibs.cmake -%post devel -p /sbin/ldconfig +%post devel +/sbin/ldconfig || : -%postun devel -p /sbin/ldconfig - -########## - -%if 0 -%package apidocs -Group: Development/Libraries -Summary: %{name} - API documentation -Requires: %{name} = %{version}-%{release} - -%description apidocs -This package includes the TDE API documentation in HTML -format for easy browsing - -%files apidocs -%defattr(-,root,root,-) -#%{tde_docdir}/HTML/en/kdelibs* -%endif +%postun devel +/sbin/ldconfig || : ########## @@ -304,18 +316,33 @@ format for easy browsing %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LD_LIBRARY_PATH="%{_libdir}" -export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" -%__mkdir build -cd build +# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet +export LD_LIBRARY_PATH="%{tde_libdir}" + + +%{?!mgaversion:%__mkdir build; cd build} %cmake \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DDOC_INSTALL_DIR=%{tde_docdir} \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ -DWITH_ARTS=ON \ -DWITH_ALSA=ON \ -DWITH_LIBART=ON \ @@ -345,7 +372,7 @@ cd build %if "%{?_prefix}" != "/usr" %__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf -%{_libdir} +%{tde_libdir} EOF %endif @@ -365,6 +392,13 @@ EOF %changelog +* Sun Jul 22 2012 Francois Andriot - 3.5.13-11 +- Fix iso kioslave not parsing large images properly [Commit #b4bba7b5] +- Add ability to set KLed off color [Commit #513ffc6e] +- Fix spinbox text entry when base is not 10 [Commit #d1c71f69] +- Update iso kioslave to better handle large images [Commit #dca4c677] +- Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770] + * Tue Jun 26 2012 Francois Andriot - 3.5.13-10 - Renames to 'trinity-tdelibs' - Enable 'aspell', 'hspell' and 'libidn' -- cgit v1.2.3