rev 6272 - in branches/kde4/packages/qt4-x11/debian: . desktop patches

Fathi Boudra fboudra-guest at alioth.debian.org
Fri May 18 11:54:02 UTC 2007 

Author: fboudra-guest
Date: 2007-05-18 11:54:02 +0000 (Fri, 18 May 2007)
New Revision: 6272

Added:
   branches/kde4/packages/qt4-x11/debian/desktop/
   branches/kde4/packages/qt4-x11/debian/desktop/assistant-qt4.desktop
   branches/kde4/packages/qt4-x11/debian/desktop/designer-qt4.desktop
   branches/kde4/packages/qt4-x11/debian/desktop/linguist-qt4.desktop
   branches/kde4/packages/qt4-x11/debian/desktop/qt4config.desktop
   branches/kde4/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/00_0173-streaming-operators-fix.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch
Removed:
   branches/kde4/packages/qt4-x11/debian/patches/41_alpha_disable_opengl_visibility.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/71_hppa_inotify_fix.dpatch
Modified:
   branches/kde4/packages/qt4-x11/debian/changelog
   branches/kde4/packages/qt4-x11/debian/patches/00list
   branches/kde4/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/03_launch_moc-qt4.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch
   branches/kde4/packages/qt4-x11/debian/rules
Log:
Update Qt packages to Qt 4.3.0 rc1.

TODO: fix -debug-and-release deprecated option and test on ARM.

  * Remove patch:
    * 71_hppa_inotify_fix: Merged upstream.
  * Update patches:
    * 02_launch_assistant-qt4
    * 03_launch_moc-qt4
    * 50_kfreebsd_build_fix
    * 80_hurd_max_path
  * Apply qt-copy patches:
    * 00_0163-fix-gcc43-support: Various fixes to get Qt 4.3 without hundreds
      of warnings compiling.
    * 00_0167-fix-group-reading: In big user environments, getgrgid_r() needs
      more memory than sysconf() returns.
    * 00_0173-streaming-operators-fix: Fixes build of KDE with release-build Qt.
    * 00_0175-fix-s390-qatomic: Fix s390(x) build.
  * Rename disable opengl visibility patch. It is not alpha architecture only.
  * Add desktop files to support Desktop Environments. (Closes: #378915)



Modified: branches/kde4/packages/qt4-x11/debian/changelog
===================================================================
--- branches/kde4/packages/qt4-x11/debian/changelog	2007-05-17 23:53:27 UTC (rev 6271)
+++ branches/kde4/packages/qt4-x11/debian/changelog	2007-05-18 11:54:02 UTC (rev 6272)
@@ -1,18 +1,47 @@
-qt4-x11 (4.3~beta~snapshot-20070424-1) unstable; urgency=low
+qt4-x11 (4.3.0~rc1-1) experimental; urgency=low
 
-  * New upstream release
-    + Remove the utf8 security patch. Applied upstream
-    + Remove the 30_arm_ftbfs patch - seems to be worked around upstream
-    + Upstream now installs pkgconfig files the right place. Fix
-    libqt4-dev.install to reflect this
-    + there is a libQtScript.so.* now. Ship it in libqt4-core currently
-  * Add utils.mk to rules file so we can use debian/rules list-missing
-  * There is currently no versioned changes file shipped by upstream
-  * Cleaning seems to fail a bit. Trying to hack around that in debian/rules
-    clean:: target
+  * New upstream release.
+  WARNING: -debug-and-release is not supported anymore on Qt/X11 and Qtopia Core
+  By default, Qt is built in release mode with separate debug information, so
+  -debug-and-release is not necessary anymore
 
- -- Sune Vuorela <debian at pusling.com>  Tue, 01 May 2007 00:33:02 +0200
+  [Sune Vuorela]
+  * Remove:
+    * 04_utf8_bug_fix: Merged upstream.
+    * 71_hppa_inotify_fix: Merged upstream.
+    * 30_arm_ftbfs_fixes: Fixed upstream. IT MUST BE TESTED.
+      Upstream claims it should compile in practically all platforms.
+      BTW, if we redefine qreal on ARM, we must update documentation:
+      Typedef for double on all platforms except for those using CPUs with ARM
+      architectures. On ARM-based platforms, qreal is a typedef for float for
+      performance reasons.
+  * Update libqt4-dev.install. Upstream installs pkgconfig files the right place.
+  * Update libqt4-core.install. Add libQtScript.
+  * Update rules:
+    * Add utils.mk to use list-missing.
+    * Comment DEB_INSTALL_CHANGELOGS_ALL. There is no changes file with
+      Qt 4.3.0 rc1.
+    * Cleaning seems to fail a bit. Trying to hack around that in clean::
+      target.
 
+  [Fathi Boudra]
+  * Update patches:
+    * 02_launch_assistant-qt4
+    * 03_launch_moc-qt4
+    * 50_kfreebsd_build_fix
+    * 80_hurd_max_path
+  * Apply qt-copy patches:
+    * 00_0163-fix-gcc43-support: Various fixes to get Qt 4.3 without hundreds
+      of warnings compiling.
+    * 00_0167-fix-group-reading: In big user environments, getgrgid_r() needs
+      more memory than sysconf() returns.
+    * 00_0173-streaming-operators-fix: Fixes build of KDE with release-build Qt.
+    * 00_0175-fix-s390-qatomic: Fix s390(x) build.
+  * Rename disable opengl visibility patch. It is not alpha architecture only.
+  * Add desktop files to support Desktop Environments. (Closes: #378915)
+
+ -- Fathi Boudra <fboudra at free.fr>  Thu, 17 May 2007 18:28:57 +0200
+
 qt4-x11 (4.2.3-1) unstable; urgency=low
 
   * New upstream release

Added: branches/kde4/packages/qt4-x11/debian/desktop/assistant-qt4.desktop
===================================================================
--- branches/kde4/packages/qt4-x11/debian/desktop/assistant-qt4.desktop	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/desktop/assistant-qt4.desktop	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,90 @@
+[Desktop Entry]
+Categories=Qt;Development;Documentation;Qt;
+Encoding=UTF-8
+Exec=/usr/bin/assistant-qt4
+Name=Qt 4 Assistant
+GenericName=Document Browser
+GenericName[af]=Dokument Blaaier
+GenericName[az]=Sənəd Səyyahı
+GenericName[bg]=Преглед на документи
+GenericName[bn]=নথী ব্রাউজার
+GenericName[br]=Furcher Teulioù
+GenericName[bs]=Preglednik QT dokumenata
+GenericName[ca]=Navegador de documents
+GenericName[cs]=Prohlížeč dokumentace
+GenericName[cy]=Porydd Dogfen
+GenericName[da]=Dokumentfremviser
+GenericName[de]=Dokumentbrowser
+GenericName[el]=Προβολέας εγγράφων
+GenericName[eo]=Dokumentorigardilo
+GenericName[es]=Navegador de documentos
+GenericName[et]=Dokumentatsiooni brauser
+GenericName[eu]=Dokumentu Ikustailua
+GenericName[fa]=مرورگر سند
+GenericName[fi]=Asiakirjaselain
+GenericName[fo]=Skjalakagari
+GenericName[fr]=Explorateur de documentation Qt
+GenericName[gl]=Explorador de Documentos
+GenericName[he]=דפדפן מסמכים
+GenericName[hi]=दस्तावेज़़ ब्राउज़र
+GenericName[hr]=Preglednik dokumenata
+GenericName[hu]=Dokumentumböngésző
+GenericName[is]=Skjalavafri
+GenericName[it]=Visualizzatore di documenti
+GenericName[ja]=ドキュメントブラウザ
+GenericName[ko]=문서 탐색기
+GenericName[lo]=ເຄື່ອງມືເລືອກເບິ່ງແຟ້ມເອກະສານ
+GenericName[lt]=Dokumentų žiūriklis
+GenericName[lv]=Dokumentu Pārlūks
+GenericName[mn]=Баримтын хөтөч
+GenericName[ms]=Pelungsur Dokumen
+GenericName[mt]=Browser ta' Dokumenti
+GenericName[nb]=Dokumentleser
+GenericName[nds]=Dokmentkieker
+GenericName[nl]=Documentbrowser
+GenericName[nn]=Dokumentlesar
+GenericName[nso]=Seinyakisi sa Tokomane
+GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਝਲਕਾਰਾ
+GenericName[pl]=Przeglądarka dokumentów
+GenericName[pt]=Navegador de Documentos
+GenericName[pt_BR]=Navegador de Documentos
+GenericName[ro]=Navigator de documente
+GenericName[ru]=Программа просмотра документов
+GenericName[se]=Dokumeantalogan
+GenericName[sk]=Prehliadač dokumentácie
+GenericName[sl]=Pregledovalnik dokumentov
+GenericName[sr]=Претраживач докумената
+GenericName[sr at Latn]=Pretraživač dokumenata
+GenericName[ss]=Ibrawuza yelidokhumente
+GenericName[sv]=Dokumentbläddrare
+GenericName[ta]=ஆவண உலாவி
+GenericName[tg]=Тафсири ҳуҷҷат
+GenericName[th]=เครื่องมือเลือกดูแฟ้มเอกสาร
+GenericName[tr]=Belge Tarayıcısı
+GenericName[uk]=Навігатор документів
+GenericName[uz]=Ҳужжат браузери
+GenericName[ven]=Buronza ya manwalwa
+GenericName[vi]=Trình duyệt tài liệu
+GenericName[wa]=Foyteu di documints
+GenericName[xh]=Umkhangeli Wencwadi Zoxwebhu
+GenericName[xx]=xxDocument Browserxx
+GenericName[zh_CN]=文档浏览器
+GenericName[zh_TW]=文件閱讀器
+GenericName[zu]=Umcingi Woshicilelo
+X-KDE-StartupNotify=true
+Icon=assistant
+Terminal=false
+Type=Application
+
+
+Name[bg]=Qt 4 асистент
+Name[cs]=Qt4 asistent
+Name[hu]=Qt 4 Asszisztens
+Name[ja]=Qt 4アシスタント
+Name[km]=អ្នក​ជំនួយការ Qt 4
+GenericName[km]=កម្មវិធី​រុករក​ឯកសារ
+Name[nb]=Qt 4-assistent
+Name[pa]=Qt 4 ਸਹਾਇਕ
+Name[sv]=Qt 4-assistent
+Name[zh_CN]=Qt 4 助手
+Name[zh_TW]=Qt 4 助理

Added: branches/kde4/packages/qt4-x11/debian/desktop/designer-qt4.desktop
===================================================================
--- branches/kde4/packages/qt4-x11/debian/desktop/designer-qt4.desktop	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/desktop/designer-qt4.desktop	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,93 @@
+[Desktop Entry]
+Categories=Qt;Development;GUIDesigner;Qt;
+Encoding=UTF-8
+Exec=/usr/bin/designer-qt4
+Name=Qt 4 Designer
+GenericName=Interface Designer
+GenericName[af]=Koppelvlak Ontwerper
+GenericName[ar]=أداة لتصميم واجهة البرامج
+GenericName[az]=Ara Üz Tərtibçisi
+GenericName[bn]=ইন্টারফেস পরিকল্পনা
+GenericName[bs]=Qt alat za dizajniranje interfejsa
+GenericName[ca]=Dissenyador d'interfícies
+GenericName[cs]=Návrhář rozhraní
+GenericName[cy]=Dylunydd Rhyngwyneb
+GenericName[da]=Grænsefladedesigner
+GenericName[de]=Schnittstellen-Designer
+GenericName[el]=Σχεδιαστής διασυνδέσεων
+GenericName[eo]=Interfacdesegnilo
+GenericName[es]=Diseñador de interfaces
+GenericName[et]=Kasutajaliidese disainer
+GenericName[eu]=Interfaze Diseinatzailea
+GenericName[fa]=طراح رابط
+GenericName[fi]=Käyttöliittymäsuunnittelija
+GenericName[fo]=Nýtaramótssniðari
+GenericName[fr]=Concepteur d'interface
+GenericName[gl]=Deseñador de Interfaces
+GenericName[he]=מעצב ממשקים
+GenericName[hi]=इंटरफेस डिज़ाइनर
+GenericName[hr]=Dizajner sučelja
+GenericName[hu]=Felülettervező
+GenericName[is]=Viðmótshönnun
+GenericName[it]=Disegnatore di interfacce
+GenericName[ja]=インターフェースデザイナー
+GenericName[ko]=인터페이스 디자이너
+GenericName[lo]=ເຄື່ອງມືອອກແບບສ່ວນຕິດຕໍ່ຜູ້ໃຊ້
+GenericName[lt]=Sąsajos redaktorius
+GenericName[lv]=Starsejas Dizainers
+GenericName[mn]=Гадаргуун дизайнер
+GenericName[ms]=Pereka Antaramuka
+GenericName[mt]=Diżinjatur tal-interfaċċji
+GenericName[nb]=Utforming av grensesnitt
+GenericName[nl]=Interface-ontwerper
+GenericName[nn]=Utforming av grensesnitt
+GenericName[nso]=Mohlami wa Interface
+GenericName[pa]=ਇੰਟਰਫੇਸ ਡਿਜਾਇਨਰ
+GenericName[pl]=Projektowanie interfejsów
+GenericName[pt]=Editor de Interfaces
+GenericName[pt_BR]=Interface do Designer
+GenericName[ro]=Dezvoltator de interfeţe
+GenericName[ru]=Редактор интерфейса приложений Qt
+GenericName[se]=Laktahábmejeaddji
+GenericName[sk]=Návrh rozhrania
+GenericName[sl]=Snovalnik vmesnikov
+GenericName[sr]=Дизајнер интерфејса
+GenericName[sr at Latn]=Dizajner interfejsa
+GenericName[ss]=Umhleli wesichumanisi
+GenericName[sv]=Gränssnittseditor
+GenericName[ta]=முகப்புப் வடிவமைப்பாளர்
+GenericName[tg]=Тароҳи робита
+GenericName[th]=เครื่องมือออกแบบส่วนติดต่อผู้ใช้
+GenericName[tr]=Arayüz tasarım programı
+GenericName[uk]=Дизайн інтерфейсу
+GenericName[uz]=Интерфейс дизайнери
+GenericName[ven]=Muvhati wa nga Phanda
+GenericName[vi]=Trình thiết kế giao diện
+GenericName[wa]=Dessineu d' eterfaces
+GenericName[xh]=Umyili Wezojongongano
+GenericName[xx]=xxInterface Designerxx
+GenericName[zh_CN]=界面设计器
+GenericName[zh_TW]=界面設計師
+GenericName[zu]=Umakhi Womxhumanisi
+X-KDE-StartupNotify=true
+MimeType=application/x-designer
+Icon=designer
+Terminal=false
+Type=Application
+
+
+
+GenericName[bg]=Дизайнер на интерфейси
+Name[el]=Σχεδιαστής Qt 4
+Name[hu]=Qt 4 Tervező
+Name[it]=Progettazione Qt 4
+Name[ja]=Qt 4デザイナ
+Name[km]=កម្មវិធី​រចនា Qt 4
+GenericName[km]=កម្មវិធី​រចនា​ចំណុច​ប្រទាក់
+Name[nl]=Qt 4 ontwerper
+Name[pa]=Qt 4 ਡਿਜ਼ਾਇਨਰ
+Name[pl]=Projektowanie interfejsów w Qt 4
+Name[ru]=Qt 4 дизайнер
+Name[uk]=Дизайнер Qt 4
+Name[zh_CN]=Qt 4 设计器
+Name[zh_TW]=Qt 4 設計師

Added: branches/kde4/packages/qt4-x11/debian/desktop/linguist-qt4.desktop
===================================================================
--- branches/kde4/packages/qt4-x11/debian/desktop/linguist-qt4.desktop	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/desktop/linguist-qt4.desktop	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,86 @@
+[Desktop Entry]
+Categories=Qt;Development;Translation;Qt;
+Encoding=UTF-8
+Exec=/usr/bin/linguist-qt4
+Name=Qt 4 Linguist
+GenericName=Translation Tool
+GenericName[af]=Vertaling Program
+GenericName[ar]=أداة للترجمة
+GenericName[az]=Tərcümə Vasitəsi
+GenericName[bn]=অনুবাদ টুল
+GenericName[bs]=Alat za prevođenje
+GenericName[ca]=Eina de traducció
+GenericName[cs]=Překladatelský nástroj
+GenericName[cy]=Erfyn Cyfieithu
+GenericName[da]=Oversættelsesværktøj
+GenericName[de]=Übersetzungsprogramm
+GenericName[el]=Εργαλείο μεταφράσεων
+GenericName[eo]=Tradukilo por Qt-programoj
+GenericName[es]=Herramienta de traducción
+GenericName[et]=Tõlkimise rakendus
+GenericName[eu]=Itzulpenerako Tresnak
+GenericName[fa]=ابزار ترجمه
+GenericName[fi]=Käännöstyökalu
+GenericName[fo]=Umsetingaramboð
+GenericName[fr]=Outil de traduction
+GenericName[gl]=Ferramenta de Traducción
+GenericName[he]=כלי תרגום
+GenericName[hi]=अनुवाद उपकरण
+GenericName[hr]=Uslužni program za prevođenje
+GenericName[hu]=Fordítássegítő
+GenericName[is]=Þýðingartól
+GenericName[it]=Strumento per le traduzioni
+GenericName[ja]=翻訳ツール
+GenericName[ko]=번역 도구
+GenericName[lo]=ເຄື່ອງມືແປພາສາ
+GenericName[lt]=Vertimo įrankis
+GenericName[lv]=Tulkošanas Rīks
+GenericName[mn]=Орчуулгын програм
+GenericName[ms]=Perkakasan Penterjemahan
+GenericName[mt]=Għodda tat-traduzzjoni
+GenericName[nb]=Oversettelsesverktøy
+GenericName[nl]=Vertaalprogramma
+GenericName[nn]=Omsetjingsverktøy
+GenericName[nso]=Sebereka sa Thlathollo
+GenericName[pa]=ਅਨੁਵਾਦ ਸੰਦ
+GenericName[pl]=Narzędzie dla tłumaczy
+GenericName[pt]=Ferramenta de Tradução
+GenericName[pt_BR]=Ferramenta de Tradução
+GenericName[ro]=Utilitar de traducere
+GenericName[ru]=Утилита локализации приложений
+GenericName[se]=Jorgalanneavvu
+GenericName[sk]=Prekladací nástroj
+GenericName[sl]=Orodje za prevajanje
+GenericName[sr]=Алат за превођење
+GenericName[sr at Latn]=Alat za prevođenje
+GenericName[ss]=Lithulusi lekuhumusha
+GenericName[sv]=Översättningsverktyg
+GenericName[ta]=மொழிபெயர்ப்புக் கருவி
+GenericName[tg]=Тарҷумагар барои QT
+GenericName[th]=เครื่องมือแปลภาษา
+GenericName[tr]=Çeviri Aracı
+GenericName[uk]=Засіб для перекладів
+GenericName[uz]=Таржима қилиш воситаси
+GenericName[ven]=Zwishumiswa zwau Dologa
+GenericName[vi]=Công cụ dịch
+GenericName[wa]=Usteye di ratournaedje
+GenericName[xh]=Isixhobo Soguqulelo lomsebenzi kolunye ulwimi
+GenericName[xx]=xxTranslation Toolxx
+GenericName[zh_CN]=翻译工具
+GenericName[zh_TW]=翻譯工具
+GenericName[zu]=Ithuluzi Lokuguqulela
+X-KDE-StartupNotify=true
+MimeType=application/x-linguist
+Terminal=false
+Type=Application
+Icon=linguist
+
+GenericName[bg]=Инструмент за превод
+Name[hu]=Qt 4 Nyelvész
+Name[ja]=Qt 4リンギスト
+Name[km]=ភាសាវិទូ Qt 4
+GenericName[km]=ឧបករណ៍​បកប្រែ
+Name[nb]=Qt 4-Linguist
+Name[pa]=Qt 4 ਅਨੁਵਾਦਕ
+Name[pl]=Lingwista Qt 4
+Name[zh_TW]=Qt 4 語言專家

Added: branches/kde4/packages/qt4-x11/debian/desktop/qt4config.desktop
===================================================================
--- branches/kde4/packages/qt4-x11/debian/desktop/qt4config.desktop	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/desktop/qt4config.desktop	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,32 @@
+[Desktop Entry]
+Categories=Qt;Settings;Qt;Utility;DesktopSettings;
+Encoding=UTF-8
+Exec=/usr/bin/qtconfig-qt4
+Name=Qt 4 Settings
+X-KDE-StartupNotify=true
+Icon=designer
+Terminal=false
+Type=Application
+
+
+Name[bg]=Настройки на Qt 4
+Name[cs]=Qt 4 nastavení
+Name[de]=Qt 4-Einstellungen
+Name[el]=Ρυθμίσεις Qt 4
+Name[fi]=Qt 4 asetukset
+Name[fr]=Paramètres Qt 4
+Name[hu]=Qt 4 beállítások
+Name[it]=Impostazioni Qt 4
+Name[ja]=Qt 4設定
+Name[km]=ការ​កំណត់ Qt 4
+Name[nb]=Qt 4-innstillinger
+Name[nl]=Qt4 Instellingen
+Name[pa]=Qt 4 ਸਥਾਪਨ
+Name[pl]=Ustawienia Qt 4
+Name[pt]=Definições QT 4 
+Name[pt_BR]=Configurações do Qt 4
+Name[ru]=Настройки Qt 4
+Name[sv]=Qt 4-inställningar
+Name[uk]=Параметри Qt 4
+Name[zh_CN]=Qt 4 设置
+Name[zh_TW]=Qt 4 設定

Added: branches/kde4/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,174 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0163-fix-gcc43-support.dpatch by Dirk Mueller <mueller at kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Various fixes to get Qt 4.3 without hundreds of warnings compiling.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/config.tests/unix/endian.test qt4-x11-4.3.0~rc1/config.tests/unix/endian.test
+--- qt4-x11-4.3.0~rc1~/config.tests/unix/endian.test	2007-05-06 17:54:44.000000000 +0200
++++ qt4-x11-4.3.0~rc1/config.tests/unix/endian.test	2007-05-17 19:09:20.000000000 +0200
+@@ -30,6 +30,7 @@
+     [ "$VERBOSE" = "yes" ] && echo "    Found 'MostSignificantByteFirst' in binary"
+     ENDIAN="BIG"
+ fi
++[ "$VERBOSE" = "yes" ] && make clean || make clean >/dev/null 2>&1
+ 
+ # done
+ if [ "$ENDIAN" = "LITTLE" ]; then
+diff -urNad qt4-x11-4.3.0~rc1~/config.tests/x11/glib/glib.cpp qt4-x11-4.3.0~rc1/config.tests/x11/glib/glib.cpp
+--- qt4-x11-4.3.0~rc1~/config.tests/x11/glib/glib.cpp	2007-05-06 17:54:37.000000000 +0200
++++ qt4-x11-4.3.0~rc1/config.tests/x11/glib/glib.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -6,7 +6,7 @@
+ {
+     GMainContext *context;
+     GSource *source;
+-    GPollFD *pollfd;
++    GPollFD *pollfd = NULL;
+     if (!g_thread_supported())
+         g_thread_init(NULL);
+     context = g_main_context_default();
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/codecs/qtextcodec.cpp qt4-x11-4.3.0~rc1/src/corelib/codecs/qtextcodec.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/codecs/qtextcodec.cpp	2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/codecs/qtextcodec.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -415,7 +415,7 @@
+             localeMapper = checkForCodec(lang);
+ 
+         // 5. "@euro"
+-        if (!localeMapper && ctype && strstr(ctype, "@euro") || lang && strstr(lang, "@euro"))
++        if ((!localeMapper && ctype && strstr(ctype, "@euro")) || (lang && strstr(lang, "@euro")))
+             localeMapper = checkForCodec("ISO 8859-15");
+ 
+         // 6. guess locale from ctype unless ctype is "C"
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qtextstream.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qtextstream.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qtextstream.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qtextstream.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -541,8 +541,8 @@
+     if (!codec || autoDetectUnicode) {
+         autoDetectUnicode = false;
+         
+-        if (bytesRead >= 2 && (uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe
+-                               || uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff)) {
++        if (bytesRead >= 2 && ((uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe)
++                               || (uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff))) {
+             codec = QTextCodec::codecForName("UTF-16");
+         } else if (!codec) {
+             codec = QTextCodec::codecForLocale();
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qurl.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qurl.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qurl.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qurl.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -4724,9 +4724,9 @@
+     if (include.isEmpty()) {
+         for (int i = 0; i < len; ++i) {
+             unsigned char c = *inputData++;
+-            if (c >= 0x61 && c <= 0x7A // ALPHA
+-                || c >= 0x41 && c <= 0x5A // ALPHA
+-                || c >= 0x30 && c <= 0x39 // DIGIT
++            if ((c >= 0x61 && c <= 0x7A) // ALPHA
++                || (c >= 0x41 && c <= 0x5A) // ALPHA
++                || (c >= 0x30 && c <= 0x39) // DIGIT
+                 || c == 0x2D // -
+                 || c == 0x2E // .
+                 || c == 0x5F // _
+@@ -4743,9 +4743,9 @@
+         const char * alsoEncode = include.constData();
+         for (int i = 0; i < len; ++i) {
+             unsigned char c = *inputData++;
+-            if ((c >= 0x61 && c <= 0x7A // ALPHA
+-                || c >= 0x41 && c <= 0x5A // ALPHA
+-                || c >= 0x30 && c <= 0x39 // DIGIT
++            if (((c >= 0x61 && c <= 0x7A) // ALPHA
++                || (c >= 0x41 && c <= 0x5A) // ALPHA
++                || (c >= 0x30 && c <= 0x39) // DIGIT
+                 || c == 0x2D // -
+                 || c == 0x2E // .
+                 || c == 0x5F // _
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp	2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -2589,8 +2589,8 @@
+ 
+         QChar c1 = format.at(i);
+         QChar c2 = format.at(i + 1);
+-        if (c1.unicode() == 'a' && c2.unicode() == 'p'
+-            || c1.unicode() == 'A' && c2.unicode() == 'P')
++        if ((c1.unicode() == 'a' && c2.unicode() == 'p')
++            || (c1.unicode() == 'A' && c2.unicode() == 'P'))
+             return true;
+ 
+         ++i;
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qapplication.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qapplication.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qapplication.cpp	2007-05-06 17:54:32.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qapplication.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -2009,11 +2009,11 @@
+ #ifndef QT_NO_TRANSLATION
+ static bool qt_detectRTLLanguage()
+ {
+-    return force_reverse ^
++    return (force_reverse ^
+         QApplication::tr("QT_LAYOUT_DIRECTION",
+                          "Translate this string to the string 'LTR' in left-to-right"
+                          " languages or to 'RTL' in right-to-left languages (such as Hebrew"
+-                         " and Arabic) to get proper widget layout.") == QLatin1String("RTL");
++                         " and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
+ }
+ #endif
+ 
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qkeymapper_x11.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qkeymapper_x11.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qkeymapper_x11.cpp	2007-05-06 17:54:32.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qkeymapper_x11.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -1315,8 +1315,8 @@
+         }
+ 
+         if (directionKeyEvent && lastWinId == keyWidget->internalWinId()) {
+-            if (keysym == XK_Shift_L && directionKeyEvent == XK_Control_L ||
+-                keysym == XK_Control_L && directionKeyEvent == XK_Shift_L) {
++            if ((keysym == XK_Shift_L && directionKeyEvent == XK_Control_L) ||
++                (keysym == XK_Control_L && directionKeyEvent == XK_Shift_L)) {
+                 directionKeyEvent = Qt::Key_Direction_L;
+             } else if (keysym == XK_Shift_R && directionKeyEvent == XK_Control_R ||
+                        keysym == XK_Control_R && directionKeyEvent == XK_Shift_R) {
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qwidget.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qwidget.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qwidget.cpp	2007-05-06 17:54:31.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qwidget.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -1804,7 +1804,7 @@
+ 
+             for (int i = 0; i < pd->children.size(); ++i) {
+                 QWidget *w = qobject_cast<QWidget *>(pd->children.at(i));
+-                if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created))
++                if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created)) {
+                     if (w!=q) {
+                         w->create();
+                     } else {
+@@ -1814,6 +1814,7 @@
+                         if (winid)
+                             w->raise();
+                     }
++                }
+             }
+         } else {
+             q->create();
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/painting/qregion_unix.cpp qt4-x11-4.3.0~rc1/src/gui/painting/qregion_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/painting/qregion_unix.cpp	2007-05-06 17:54:26.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/painting/qregion_unix.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -1929,7 +1929,7 @@
+         else
+             --isInside;
+ 
+-        if (!inside && !isInside || inside && isInside) {
++        if ((!inside && !isInside) || (inside && isInside)) {
+             pWETE->nextWETE = AET;
+             pWETE = AET;
+             inside = !inside;
+diff -urNad qt4-x11-4.3.0~rc1~/src/tools/uic/driver.cpp qt4-x11-4.3.0~rc1/src/tools/uic/driver.cpp
+--- qt4-x11-4.3.0~rc1~/src/tools/uic/driver.cpp	2007-05-06 17:54:17.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/tools/uic/driver.cpp	2007-05-17 19:09:20.000000000 +0200
+@@ -160,7 +160,7 @@
+ 
+ static bool isAnsiCCharacter(const QChar& c)
+ {
+-    return c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z')
++    return (c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z'))
+            || c.isDigit() || c == QLatin1Char('_');
+ }
+ 


Property changes on: branches/kde4/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/kde4/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0167-fix-group-reading.dpatch by Dirk Mueller <mueller at kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: In big user environments, getgrgid_r() needs more memory than sysconf() returns.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp	2007-05-17 19:10:48.000000000 +0200
+@@ -830,9 +830,16 @@
+     } else if (own == OwnerGroup) {
+         struct group *gr = 0;
+ #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
+-        buf.resize(sysconf(_SC_GETGR_R_SIZE_MAX));
+-        struct group entry;
+-        getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr);
++        for (unsigned size = sysconf(_SC_GETGR_R_SIZE_MAX); size < 256000; size += size)
++        {
++            buf.resize(size);
++            struct group entry;
++            // ERANGE indicates that the buffer was too small
++            if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr)
++                || errno != ERANGE)
++                break;
++        }
++
+ #else
+         gr = getgrgid(ownerId(own));
+ #endif


Property changes on: branches/kde4/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/kde4/packages/qt4-x11/debian/patches/00_0173-streaming-operators-fix.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/00_0173-streaming-operators-fix.dpatch	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/patches/00_0173-streaming-operators-fix.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0173-streaming-operators-fix.dpatch by Trolltech
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes build of KDE with release-build Qt.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qdir.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qdir.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qdir.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qdir.cpp	2007-05-17 19:11:49.000000000 +0200
+@@ -24,7 +24,7 @@
+ #include "qplatformdefs.h"
+ #include "qdir.h"
+ #include "qabstractfileengine.h"
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ #include "qdebug.h"
+ #endif
+ #include "qfsfileengine.h"
+@@ -2406,7 +2406,7 @@
+     Use QDir::SortFlags instead.
+ */
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ QDebug operator<<(QDebug debug, QDir::Filters filters)
+ {
+     QStringList flags;
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qdir.h qt4-x11-4.3.0~rc1/src/corelib/io/qdir.h
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qdir.h	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qdir.h	2007-05-17 19:11:49.000000000 +0200
+@@ -229,7 +229,7 @@
+ Q_DECLARE_OPERATORS_FOR_FLAGS(QDir::Filters)
+ Q_DECLARE_OPERATORS_FOR_FLAGS(QDir::SortFlags)
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ class QDebug;
+ Q_CORE_EXPORT QDebug operator<<(QDebug debug, QDir::Filters filters);
+ Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QDir &dir);
+diff -urNad qt4-x11-4.3.0~rc1~/src/network/qabstractsocket.cpp qt4-x11-4.3.0~rc1/src/network/qabstractsocket.cpp
+--- qt4-x11-4.3.0~rc1~/src/network/qabstractsocket.cpp	2007-05-06 17:54:35.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/network/qabstractsocket.cpp	2007-05-17 19:11:49.000000000 +0200
+@@ -2302,7 +2302,7 @@
+ */
+ #endif // QT3_SUPPORT
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, QAbstractSocket::SocketError error)
+ {
+     switch (error) {
+diff -urNad qt4-x11-4.3.0~rc1~/src/network/qabstractsocket.h qt4-x11-4.3.0~rc1/src/network/qabstractsocket.h
+--- qt4-x11-4.3.0~rc1~/src/network/qabstractsocket.h	2007-05-06 17:54:36.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/network/qabstractsocket.h	2007-05-17 19:11:49.000000000 +0200
+@@ -201,7 +201,7 @@
+ #endif
+ };
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ #include <QtCore/qdebug.h>
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug, QAbstractSocket::SocketError);
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug, QAbstractSocket::SocketState);


Property changes on: branches/kde4/packages/qt4-x11/debian/patches/00_0173-streaming-operators-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/kde4/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0175-fix-s390-qatomic.dpatch by Dirk Mueller <mueller at kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix s390(x) build.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/arch/qatomic_s390.h qt4-x11-4.3.0~rc1/src/corelib/arch/qatomic_s390.h
+--- qt4-x11-4.3.0~rc1~/src/corelib/arch/qatomic_s390.h	2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/arch/qatomic_s390.h	2007-05-17 19:13:18.000000000 +0200
+@@ -182,10 +182,20 @@
+ #endif
+ }
+ 
+-#error "fetch-and-add not implemented"
+-// int q_atomic_fetch_and_add_int(volatile int *ptr, int value);
+-// int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
+-// int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
++inline int q_atomic_fetch_and_add_int(volatile int *ptr, int value)
++{
++    return __sync_fetch_and_add(ptr, value);
++}
++
++inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value)
++{
++    return __sync_fetch_and_add(ptr, value);
++}
++
++inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value)
++{
++    return __sync_fetch_and_add(ptr, value);
++}
+ 
+ QT_END_HEADER
+ 


Property changes on: branches/kde4/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: branches/kde4/packages/qt4-x11/debian/patches/00list
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/00list	2007-05-17 23:53:27 UTC (rev 6271)
+++ branches/kde4/packages/qt4-x11/debian/patches/00list	2007-05-18 11:54:02 UTC (rev 6272)
@@ -1,15 +1,17 @@
+00_0163-fix-gcc43-support
+00_0167-fix-group-reading
+00_0173-streaming-operators-fix
+00_0175-fix-s390-qatomic
 01_qmake_for_debian
 02_launch_assistant-qt4
 03_launch_moc-qt4
-04_utf8_bug_fix
 20_mips_atomic_ops
-30_arm_ftbfs_fixes
 31_arm_eabi_fix
 40_alpha_ice
-41_alpha_disable_opengl_visibility
+41_disable_opengl_visibility
 50_kfreebsd_build_fix
 51_kfreebsd_mkspecs
 60_m68k_inotify_fix
 70_hppa_ldcw_fix
-71_hppa_inotify_fix
 80_hurd_max_path
+

Modified: branches/kde4/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.dpatch	2007-05-17 23:53:27 UTC (rev 6271)
+++ branches/kde4/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -5,20 +5,20 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./tools/assistant/lib/qassistantclient.cpp /home/nelson/tmp/dpep-work.Zny9K3/qt4-x11-4.0.1/tools/assistant/lib/qassistantclient.cpp
---- ./tools/assistant/lib/qassistantclient.cpp	2005-08-16 01:41:14.000000000 -0700
-+++ /home/nelson/tmp/dpep-work.Zny9K3/qt4-x11-4.0.1/tools/assistant/lib/qassistantclient.cpp	2005-09-11 09:01:31.000000000 -0700
-@@ -128,11 +128,11 @@
-     : QObject( parent ), host ( "localhost" )
+diff -urNad qt4-x11-4.3.0~rc1~/tools/assistant/lib/qassistantclient.cpp qt4-x11-4.3.0~rc1/tools/assistant/lib/qassistantclient.cpp
+--- qt4-x11-4.3.0~rc1~/tools/assistant/lib/qassistantclient.cpp	2007-05-06 17:54:36.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/assistant/lib/qassistantclient.cpp	2007-05-18 09:43:26.000000000 +0200
+@@ -172,11 +172,11 @@
+     : QObject( parent ), host ( QLatin1String("localhost") )
  {
      if ( path.isEmpty() )
--        assistantCommand = "assistant";
-+        assistantCommand = "assistant-qt4";
+-        assistantCommand = QLatin1String("assistant");
++        assistantCommand = QLatin1String("assistant-qt4");
      else {
          QFileInfo fi( path );
          if ( fi.isDir() )
--            assistantCommand = path + "/assistant";
-+            assistantCommand = path + "/assistant-qt4";
+-            assistantCommand = path + QLatin1String("/assistant");
++            assistantCommand = path + QLatin1String("/assistant-qt4");
          else
              assistantCommand = path;
      }

Modified: branches/kde4/packages/qt4-x11/debian/patches/03_launch_moc-qt4.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/03_launch_moc-qt4.dpatch	2007-05-17 23:53:27 UTC (rev 6271)
+++ branches/kde4/packages/qt4-x11/debian/patches/03_launch_moc-qt4.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -5,15 +5,15 @@
 ## DP: Ensure the Qt4 version of moc is launched.
 
 @DPATCH@
-diff -urNad qt4-x11-4.2.2~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp qt4-x11-4.2.2/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
---- qt4-x11-4.2.2~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2006-11-27 12:26:30.000000000 -0500
-+++ qt4-x11-4.2.2/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2007-03-03 12:53:16.000000000 -0500
-@@ -375,7 +375,7 @@
+diff -urNad qt4-x11-4.3.0~rc1~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp qt4-x11-4.3.0~rc1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+--- qt4-x11-4.3.0~rc1~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2007-05-06 17:54:54.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	2007-05-18 09:44:18.000000000 +0200
+@@ -376,7 +376,7 @@
          else {
              // run moc on this file
              QProcess proc;
--            proc.start(QLatin1String("moc"), QStringList() << QFile::decodeName(argv[i]));
-+            proc.start(QLatin1String("moc-qt4"), QStringList() << QFile::decodeName(argv[i]));
+-            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
++            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
  
              if (!proc.waitForStarted()) {
                  fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");

Deleted: branches/kde4/packages/qt4-x11/debian/patches/41_alpha_disable_opengl_visibility.dpatch

Added: branches/kde4/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.1.3~/src/opengl/opengl.pro qt4-x11-4.1.3/src/opengl/opengl.pro
+--- qt4-x11-4.1.3~/src/opengl/opengl.pro	2006-05-14 03:46:44.000000000 -0700
++++ qt4-x11-4.1.3/src/opengl/opengl.pro	2006-06-21 10:17:37.000000000 -0700
+@@ -5,6 +5,7 @@
+ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
+ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+ 
++QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden
+ 
+ include(../qbase.pri)
+ 


Property changes on: branches/kde4/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: branches/kde4/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch	2007-05-17 23:53:27 UTC (rev 6271)
+++ branches/kde4/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -1,14 +1,14 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger at seznam.cz> 
+## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger at seznam.cz>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC
+## DP: No description.
 
 @DPATCH@
-diff -ur qt4-x11-4.2.1/src/corelib/global/qglobal.h qt4-x11-4.2.1/src/corelib/global/qglobal.h
---- qt4-x11-4.2.1/src/corelib/global/qglobal.h	2006-10-20 17:35:14.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/global/qglobal.h	2006-12-06 23:06:11.000000000 +0100
-@@ -101,6 +102,12 @@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h
+--- qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h	2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h	2007-05-18 10:48:20.000000000 +0200
+@@ -110,6 +110,12 @@
  #  define Q_OS_RELIANT
  #elif defined(__linux__) || defined(__linux)
  #  define Q_OS_LINUX
@@ -21,21 +21,21 @@
  #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #  define Q_OS_FREEBSD
  #  define Q_OS_BSD4
-@@ -121,8 +128,6 @@
+@@ -130,8 +136,6 @@
  #  define Q_OS_AIX
  #elif defined(__Lynx__)
  #  define Q_OS_LYNX
--#elif defined(__GNU_HURD__)
+-#elif defined(__GNU__)
 -#  define Q_OS_HURD
  #elif defined(__DGUX__)
  #  define Q_OS_DGUX
  #elif defined(__QNXNTO__)
-diff -ur qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp
---- qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp	2006-10-20 17:35:15.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp	2006-12-07 09:01:45.000000000 +0100
-@@ -248,11 +248,11 @@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/plugin/qlibrary.cpp qt4-x11-4.3.0~rc1/src/corelib/plugin/qlibrary.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/plugin/qlibrary.cpp	2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/plugin/qlibrary.cpp	2007-05-18 10:50:38.000000000 +0200
+@@ -278,11 +278,11 @@
  
- #if defined(Q_OS_UNIX)
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
  
 -#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
@@ -47,19 +47,19 @@
  
  static long qt_find_pattern(const char *s, ulong s_len,
                               const char *pattern, ulong p_len)
-diff -ur qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp
---- qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp	2006-10-20 17:35:15.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp	2006-12-07 09:01:22.000000000 +0100
-@@ -47,7 +47,7 @@
- #include <stdlib.h>
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp	2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp	2007-05-18 10:51:21.000000000 +0200
+@@ -48,7 +48,7 @@
  #include <qdebug.h>
+ #include <time.h>
  
 -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
 +#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
  #    include <fenv.h>
  #endif
  
-@@ -5639,7 +5639,7 @@
+@@ -5906,7 +5906,7 @@
      _control87(MCW_EM, MCW_EM);
  #endif
  
@@ -68,7 +68,7 @@
      fenv_t envp;
      feholdexcept(&envp);
  #endif
-@@ -5655,7 +5655,7 @@
+@@ -5922,7 +5922,7 @@
  #endif //_M_X64
  #endif //Q_OS_WIN
  

Deleted: branches/kde4/packages/qt4-x11/debian/patches/71_hppa_inotify_fix.dpatch

Modified: branches/kde4/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch	2007-05-17 23:53:27 UTC (rev 6271)
+++ branches/kde4/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch	2007-05-18 11:54:02 UTC (rev 6272)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad qt4-x11-4.2.2~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.2.2/src/corelib/io/qfsfileengine_unix.cpp
---- qt4-x11-4.2.2~/src/corelib/io/qfsfileengine_unix.cpp	2006-11-27 12:26:06.000000000 -0500
-+++ qt4-x11-4.2.2/src/corelib/io/qfsfileengine_unix.cpp	2007-03-04 10:50:03.000000000 -0500
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp	2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp	2007-05-18 11:11:35.000000000 +0200
 @@ -40,6 +40,10 @@
  # include <private/qcore_mac_p.h>
  #endif
@@ -16,6 +16,6 @@
 +#define PATH_MAX 4096
 +#endif
 +
- void QFSFileEnginePrivate::init()
- {
- }
+ /*!
+     \internal
+ 

Modified: branches/kde4/packages/qt4-x11/debian/rules
===================================================================
--- branches/kde4/packages/qt4-x11/debian/rules	2007-05-17 23:53:27 UTC (rev 6271)
+++ branches/kde4/packages/qt4-x11/debian/rules	2007-05-18 11:54:02 UTC (rev 6272)
@@ -10,7 +10,7 @@
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_MAKE_INVOKE := $(MAKE)
-DEB_MAKE_BUILD_TARGET := sub-src sub-tools 
+DEB_MAKE_BUILD_TARGET := sub-src sub-tools
 DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
@@ -21,6 +21,7 @@
 DEB_MAKE_CLEAN_TARGET := confclean distclean
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 
+# There is no changes file with Qt4.3.0rc1
 #DEB_INSTALL_CHANGELOGS_ALL := changes-4.2.3
 
 ifeq ($(DEB_HOST_ARCH),arm)
@@ -33,7 +34,6 @@
         PLATFORM_ARG = glibc-g++
 endif
 
-
 common-configure-arch::
 	./configure -confirm-license \
 	            -prefix "/usr" \
@@ -44,7 +44,7 @@
 	            -translationdir "/usr/share/qt4/translations" \
 	            -sysconfdir "/etc/xdg" \
 	            -platform $(PLATFORM_ARG) \
-		    -debug-and-release \
+	            -debug-and-release \
 	            -fast \
 	            -no-rpath \
 	            -system-zlib \
@@ -54,7 +54,7 @@
 	            -qt-gif \
 	            -qt-sql-psql \
 	            -qt-sql-mysql \
-		    -qt-sql-sqlite \
+	            -qt-sql-sqlite \
 	            -system-sqlite \
 	            -qt-sql-sqlite2 \
 	            -I/usr/include/freetype2 \
@@ -76,6 +76,7 @@
 	      src/corelib/global/qconfig.*
 
 	rm -rf lib/ plugins/
+
 	find . -exec file {} \; | grep ELF | sed 's/:.*//'  | xargs rm -f
 	rm -f examples/tools/plugandpaint/plugins/libpnp_basictools.a
 	rm -f examples/qdbus/complexpingpong/Makefile*
@@ -90,7 +91,6 @@
 # Hack to fix dpatch-edit-patch
 unpatch: deapply-dpatches
 
-
 BINDIR := $(DEB_DESTDIR)/usr/bin
 common-install-arch::
 # Tack on -qt4 to the binaries that use the alternatives system
@@ -121,3 +121,18 @@
 	    install -p -D -m644 debian/$(cdbs_curpkg).lintian \
 	    debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
         fi
+
+install/qt4-designer::
+	install -D -p -m0644 debian/desktop/designer-qt4.desktop \
+		$(DEB_DESTDIR)/usr/share/applications/designer-qt4.desktop
+
+install/qt4-dev-tools::
+	install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
+		$(DEB_DESTDIR)/usr/share/applications/assistant-qt4.desktop
+	install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
+		$(DEB_DESTDIR)/usr/share/applications/linguist-qt4.desktop
+
+install/qt4-qtconfig::
+	install -D -p -m0644 debian/desktop/qt4config.desktop \
+		$(DEB_DESTDIR)/usr/share/applications/qt4config.desktop
+

More information about the pkg-kde-commits mailing list