summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/PKGBUILD.template14
-rwxr-xr-xarch/build.sh8
-rw-r--r--arch/tde-base/tde-i18n/PKGBUILD148
-rw-r--r--arch/tde-base/tde-tdeadmin/PKGBUILD36
-rw-r--r--arch/tde-base/tde-tdeartwork/PKGBUILD37
-rw-r--r--arch/tde-base/tde-tdebindings/PKGBUILD26
-rw-r--r--arch/tde-base/tde-tdebindings/bp000-817f960e.diff31
-rw-r--r--arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff401
-rw-r--r--arch/tde-base/tde-tdebindings/bp002-33697c89.diff24
-rw-r--r--arch/tde-base/tde-tdegraphics/PKGBUILD59
-rw-r--r--arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff60
-rw-r--r--arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff33
-rw-r--r--arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff63
-rw-r--r--arch/tde-base/tde-tdeutils/PKGBUILD36
-rw-r--r--arch/tde-core/tde-arts/PKGBUILD40
-rw-r--r--arch/tde-core/tde-avahi-tqt/PKGBUILD32
-rw-r--r--arch/tde-core/tde-cmake-trinity/PKGBUILD51
-rw-r--r--arch/tde-core/tde-dbus-1-tqt/PKGBUILD38
-rw-r--r--arch/tde-core/tde-dbus-tqt/PKGBUILD33
-rw-r--r--arch/tde-core/tde-libart-lgpl/PKGBUILD23
-rw-r--r--arch/tde-core/tde-tdebase/PKGBUILD52
-rw-r--r--arch/tde-core/tde-tdelibs/PKGBUILD35
-rw-r--r--arch/tde-core/tde-tqca-tls/PKGBUILD38
-rw-r--r--arch/tde-core/tde-tqca/PKGBUILD54
-rw-r--r--arch/tde-core/tde-tqt3/PKGBUILD28
-rw-r--r--arch/tde-core/tde-tqt3/bp000-fix-build-key.diff21
-rw-r--r--arch/tde-core/tde-tqtinterface/PKGBUILD43
-rw-r--r--arch/tde-core/tde-tqtinterface/tqtpc-location.patch11
-rw-r--r--arch/tde-devel/tde-tdesdk/PKGBUILD33
-rw-r--r--arch/tde-devel/tde-tdevelop/PKGBUILD38
-rw-r--r--arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff1238
-rw-r--r--arch/tde-devel/tde-tdewebdev/PKGBUILD36
-rw-r--r--arch/tde-extra/tde-abakus/PKGBUILD17
-rw-r--r--arch/tde-extra/tde-akode/PKGBUILD54
-rw-r--r--arch/tde-extra/tde-akode/tde-akode.install11
-rw-r--r--arch/tde-extra/tde-amarok/PKGBUILD45
-rw-r--r--arch/tde-extra/tde-basket/PKGBUILD26
-rw-r--r--arch/tde-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff60
-rw-r--r--arch/tde-extra/tde-gtk-qt-engine/PKGBUILD34
-rw-r--r--arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD28
-rw-r--r--arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff32
-rw-r--r--arch/tde-extra/tde-kmplayer/PKGBUILD37
-rw-r--r--arch/tde-extra/tde-krusader/PKGBUILD22
-rw-r--r--arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD34
-rw-r--r--arch/tde-extra/tde-style-qtcurve/PKGBUILD29
-rw-r--r--arch/tde-extra/tde-systemsettings/PKGBUILD29
-rw-r--r--arch/tde-extra/tde-tdeaccessibility/PKGBUILD36
-rw-r--r--arch/tde-extra/tde-tdeaddons/PKGBUILD38
-rw-r--r--arch/tde-extra/tde-tdeedu/PKGBUILD45
-rw-r--r--arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff31
-rw-r--r--arch/tde-extra/tde-tdegames/PKGBUILD37
-rw-r--r--arch/tde-extra/tde-tdemultimedia/PKGBUILD39
-rw-r--r--arch/tde-extra/tde-tdenetwork/PKGBUILD50
-rw-r--r--arch/tde-extra/tde-tdenetworkmanager/PKGBUILD41
-rw-r--r--arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff78
-rw-r--r--arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff121
-rw-r--r--arch/tde-extra/tde-tdepim/PKGBUILD31
-rw-r--r--arch/tde-extra/tde-tdepowersave/PKGBUILD31
-rw-r--r--arch/tde-extra/tde-tdesudo/PKGBUILD37
-rw-r--r--arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff31
-rw-r--r--arch/tde-extra/tde-tdetoys/PKGBUILD33
-rw-r--r--arch/tde-extra/tde-tdmtheme/PKGBUILD32
-rw-r--r--arch/tde-extra/tde-tork/PKGBUILD26
-rw-r--r--arch/tde-extra/tde-tork/bp000-7576a4bf.diff31
-rw-r--r--arch/tde-extra/tde-twin-style-crystal/PKGBUILD68
-rw-r--r--arch/tde-extra/tde-yakuake/PKGBUILD19
-rw-r--r--arch/tde-libs/tde-libcaldav/PKGBUILD31
-rw-r--r--arch/tde-libs/tde-libcarddav/PKGBUILD30
-rw-r--r--arch/tde-libs/tde-libkdcraw/PKGBUILD75
-rw-r--r--arch/tde-libs/tde-libkexiv2/PKGBUILD36
-rw-r--r--arch/tde-meta/PKGBUILD8
-rw-r--r--debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs2
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install2
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/control26
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/docs3
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install2
-rwxr-xr-xdebian/_base/applications/multimedia/amarok/debian/rules1
-rw-r--r--debian/_base/applications/multimedia/mplayerthumbs/debian/docs2
-rw-r--r--debian/_base/applications/office/basket/debian/docs2
-rw-r--r--debian/_base/applications/office/kbibtex/debian/docs2
-rw-r--r--debian/_base/applications/office/kbookreader/debian/docs1
-rw-r--r--debian/_base/applications/office/kile/debian/control2
-rw-r--r--debian/_base/applications/office/kile/debian/patches/series (renamed from debian/_base/applications/office/kile/debian/patches/.gitignore)0
-rwxr-xr-xdebian/_base/applications/office/kile/debian/rules73
-rw-r--r--debian/_base/applications/office/kile/debian/watch2
-rw-r--r--debian/_base/applications/office/knowit/debian/docs3
-rw-r--r--debian/_base/applications/office/tellico/debian/docs2
-rw-r--r--debian/_base/applications/settings/kdpkg/debian/docs1
-rw-r--r--debian/_base/applications/settings/kima/debian/docs2
-rw-r--r--debian/_base/applications/settings/kiosktool/debian/docs2
-rw-r--r--debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs2
-rw-r--r--debian/_base/applications/settings/klcddimmer/debian/docs2
-rw-r--r--debian/_base/applications/settings/tde-systemsettings/debian/docs8
-rw-r--r--debian/_base/applications/settings/tdenetworkmanager/debian/docs1
-rw-r--r--debian/_base/applications/settings/tdesudo/debian/docs2
-rw-r--r--debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs8
-rw-r--r--debian/_base/applications/system/dolphin/debian/docs3
-rw-r--r--debian/_base/applications/system/katapult/debian/docs2
-rw-r--r--debian/_base/applications/system/kcmautostart/debian/docs1
-rw-r--r--debian/_base/applications/system/kdbusnotification/debian/docs2
-rw-r--r--debian/_base/applications/system/klamav/debian/docs2
-rw-r--r--debian/_base/applications/system/knemo/debian/docs2
-rw-r--r--debian/_base/applications/system/knetload/debian/docs2
-rw-r--r--debian/_base/applications/system/knetstats/debian/docs2
-rw-r--r--debian/_base/applications/system/kshutdown/debian/docs2
-rw-r--r--debian/_base/applications/system/ksystemlog/debian/docs2
-rw-r--r--debian/_base/applications/system/kvkbd/debian/docs1
-rw-r--r--debian/_base/applications/system/smartcardauth/debian/docs1
-rw-r--r--debian/_base/applications/system/tdesshaskpass/debian/docs1
-rw-r--r--debian/_base/applications/tdeio/tdeio-apt/debian/docs2
-rw-r--r--debian/_base/applications/tdeio/tdeio-ftps/debian/docs2
-rw-r--r--debian/_base/applications/tdeio/tdeio-sword/debian/docs2
-rw-r--r--debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs2
-rw-r--r--debian/_base/applications/themes/ksplash-engine-moodin/debian/docs2
-rw-r--r--debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs2
-rw-r--r--debian/_base/applications/themes/tde-style-domino/debian/docs2
-rw-r--r--debian/_base/applications/themes/tde-style-lipstik/debian/docs4
-rw-r--r--debian/_base/applications/utilities/filelight/debian/docs3
-rw-r--r--debian/_base/applications/utilities/kchmviewer/debian/docs2
-rw-r--r--debian/_base/applications/utilities/kdirstat/debian/docs2
-rw-r--r--debian/_base/applications/utilities/keep/debian/docs2
-rw-r--r--debian/_base/applications/utilities/knutclient/debian/docs3
-rw-r--r--debian/_base/applications/utilities/krename/debian/docs2
-rw-r--r--debian/_base/applications/utilities/ksensors/debian/docs2
-rw-r--r--debian/_base/applications/utilities/mathemagics/debian/docs2
-rw-r--r--debian/_base/common/cmake/debian/control2
-rw-r--r--debian/_base/core/tdebase/debian/control2
-rw-r--r--debian/_base/core/tdebindings/debian/control2
-rwxr-xr-xdebian/_base/core/tdegraphics/debian/rules4
-rw-r--r--debian/_base/core/tdetoys/debian/kweather-trinity.install9
-rw-r--r--debian/_base/dependencies/akode/debian/docs2
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk246
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/changelog66
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/compat1
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/control61
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/copyright101
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/docs1
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install31
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install8
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install1
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/patches/series (renamed from ubuntu/_base/applications/office/kile/debian/patches/.gitignore)0
-rwxr-xr-xdebian/_base/dependencies/polkit-tqt/debian/rules23
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/source/format1
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/source/options6
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs2
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install3
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides23
-rwxr-xr-xdebian/_base/dependencies/python-tqt/debian/rules12
-rw-r--r--debian/_base/dependencies/python-tqt/debian/watch3
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/control3
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 (renamed from ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1)20
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages2
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install2
-rwxr-xr-xdebian/_base/dependencies/sip4-tqt/debian/rules23
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py13
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sipconfig.py13
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/watch3
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk246
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/control21
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/dirs2
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/docs1
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install3
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install2
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install1
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install5
-rwxr-xr-xdebian/_base/dependencies/tqscintilla/debian/rules129
-rwxr-xr-xdebian/_base/dependencies/tqtinterface/debian/rules9
-rw-r--r--debian/_base/libraries/libkexiv2/debian/docs2
-rw-r--r--debian/_base/libraries/libtdeldap/debian/docs1
-rwxr-xr-xdebian/_base/libraries/libtqt-perl/debian/rules1
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs2
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install2
-rwxr-xr-xdebian/_base/libraries/python-trinity/debian/rules4
-rw-r--r--debian/_base/libraries/python-trinity/debian/watch3
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/debian/control2
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm3
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/control2
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm3
-rw-r--r--debian/_base/metapackages/synaptic-trinity/debian/postrm2
-rwxr-xr-xdebian/_buildscripts/local/00_extradeps.sh9
-rw-r--r--debian/_buildscripts/local/additional_files/etc/pbuilderrc40
-rw-r--r--debian/_buildscripts/local/internals/distro_list.txt10
-rw-r--r--dilos/common/cmake/debian/control2
-rw-r--r--dilos/core/tdebase/debian/control2
-rw-r--r--dilos/core/tdebindings/debian/control2
-rwxr-xr-xdilos/core/tdegraphics/debian/rules4
-rw-r--r--dilos/core/tdetoys/debian/kweather-trinity.install9
-rwxr-xr-xdilos/dependencies/python-tqt/debian/rules6
-rw-r--r--dilos/dependencies/sip4-tqt/debian/control3
-rw-r--r--dilos/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 (renamed from dilos/dependencies/sip4-tqt/debian/manpages/sip.1)20
-rw-r--r--dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages2
-rw-r--r--dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install2
-rwxr-xr-xdilos/dependencies/sip4-tqt/debian/rules23
-rw-r--r--dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py13
-rw-r--r--dilos/dependencies/sip4-tqt/debian/sipconfig.py13
-rw-r--r--dilos/dependencies/sip4-tqt/debian/watch3
-rw-r--r--dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk246
-rw-r--r--dilos/dependencies/tqscintilla/debian/cdbs/versions.pl19
-rw-r--r--dilos/dependencies/tqscintilla/debian/control19
-rw-r--r--dilos/dependencies/tqscintilla/debian/dirs2
-rw-r--r--dilos/dependencies/tqscintilla/debian/docs1
-rw-r--r--dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install3
-rw-r--r--dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install2
-rw-r--r--dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install1
-rw-r--r--dilos/dependencies/tqscintilla/debian/libtqscintilla7.install5
-rwxr-xr-xdilos/dependencies/tqscintilla/debian/rules131
m---------gentoo0
l---------raspbian/raspbian-bookworm1
l---------raspbian/raspbian-stretch1
-rw-r--r--redhat/Makefile16
-rw-r--r--redhat/applications/amarok/amarok.spec2
-rw-r--r--redhat/applications/codeine/codeine.spec2
-rw-r--r--redhat/applications/k3b/k3b.spec4
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec47
-rw-r--r--redhat/applications/kaffeine/kaffeine.spec2
-rw-r--r--redhat/applications/kasablanca/kasablanca.spec2
-rw-r--r--redhat/applications/kbibtex/kbibtex.spec2
-rw-r--r--redhat/applications/kbiff/kbiff.spec2
-rw-r--r--redhat/applications/kchmviewer/kchmviewer.spec2
-rw-r--r--redhat/applications/kcmautostart/kcmautostart.spec2
-rw-r--r--redhat/applications/kftpgrabber/kftpgrabber.spec49
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3.spec2
-rw-r--r--redhat/applications/kima/kima.spec2
-rw-r--r--redhat/applications/kiosktool/kiosktool.spec2
-rw-r--r--redhat/applications/kkbswitch/kkbswitch.spec2
-rw-r--r--redhat/applications/klamav/klamav.spec7
-rw-r--r--redhat/applications/klcddimmer/klcddimmer.spec2
-rw-r--r--redhat/applications/kmplayer/kmplayer.spec2
-rw-r--r--redhat/applications/knmap/knmap.spec2
-rw-r--r--redhat/applications/knutclient/knutclient.spec4
-rw-r--r--redhat/applications/koffice/koffice.spec2
-rw-r--r--redhat/applications/kpicosim/kpicosim.spec2
-rw-r--r--redhat/applications/kpowersave/kpowersave.spec2
-rw-r--r--redhat/applications/kscope/kscope.spec61
-rw-r--r--redhat/applications/ksensors/ksensors.spec2
-rw-r--r--redhat/applications/kshowmail/kshowmail.spec2
-rw-r--r--redhat/applications/kshutdown/kshutdown.spec2
-rw-r--r--redhat/applications/ksystemlog/ksystemlog.spec56
-rw-r--r--redhat/applications/kvkbd/kvkbd.spec2
-rw-r--r--redhat/applications/kvpnc/kvpnc.spec2
-rw-r--r--redhat/applications/mathemagics/mathemagics.spec4
-rw-r--r--redhat/applications/mplayerthumbs/mplayerthumbs.spec22
-rw-r--r--redhat/applications/potracegui/potracegui.spec2
-rw-r--r--redhat/applications/system/tdesshaskpass/tdesshaskpass.spec159
-rw-r--r--redhat/applications/tde-style-baghira/tde-style-baghira.spec1
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings.spec60
-rw-r--r--redhat/applications/tdeio-ftps/tdeio-ftps.spec2
-rw-r--r--redhat/applications/tdeio-sword/tdeio-sword.spec2
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec2
-rw-r--r--redhat/applications/tdepacman/tdepacman.spec2
-rw-r--r--redhat/applications/twin-style-dekorator/twin-style-dekorator.spec158
-rwxr-xr-xredhat/build/get_latest_built_package_version.sh22
-rwxr-xr-xredhat/build/rpmdist.sh2
l---------redhat/dependencies/tqt3/build-examples.sh2
-rw-r--r--redhat/docker/f34/Dockerfile.x86_645
-rw-r--r--redhat/docker/f35/Dockerfile.x86_6436
-rw-r--r--redhat/docker/f35/packages236
-rw-r--r--redhat/docker/f35/rpmbuild.repo11
-rw-r--r--redhat/docker/f35/rpmmacros6
-rwxr-xr-xredhat/docker/opensuse32.sh6
-rw-r--r--redhat/docker/oss153/packages2
-rw-r--r--redhat/docker/osstw/Dockerfile.i68610
-rw-r--r--redhat/docker/osstw/Dockerfile.x86_644
-rw-r--r--redhat/docker/osstw/packages1
-rw-r--r--redhat/docker/pclinuxos.pkg8
-rwxr-xr-xredhat/docker/pclinuxos.sh7
-rw-r--r--redhat/docker/pclinuxos/packages.x86_643
-rw-r--r--redhat/docker/pclinuxos/rpmmacros1
-rw-r--r--redhat/extras/fileshareset/fileshareset.spec2
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop.spec2
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw.spec54
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc355
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc3516
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc3523
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc355
-rw-r--r--redhat/main/tdebase/tdebase.spec10
-rw-r--r--redhat/main/tdebase/tdm.fc35.te11
-rw-r--r--redhat/main/tdebase/tdm.service.fc3512
-rw-r--r--redhat/main/tdelibs/tdelibs.spec6
-rw-r--r--redhat/main/tdenetwork/tdenetwork.spec4
-rw-r--r--redhat/main/tdetoys/tdetoys.spec4
-rw-r--r--ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/control26
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/docs3
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install2
-rwxr-xr-xubuntu/_base/applications/multimedia/amarok/debian/rules1
-rw-r--r--ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs2
-rw-r--r--ubuntu/_base/applications/office/basket/debian/docs2
-rw-r--r--ubuntu/_base/applications/office/kbibtex/debian/docs2
-rw-r--r--ubuntu/_base/applications/office/kbookreader/debian/docs1
-rw-r--r--ubuntu/_base/applications/office/kile/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kile/debian/patches/series0
-rwxr-xr-xubuntu/_base/applications/office/kile/debian/rules73
-rw-r--r--ubuntu/_base/applications/office/kile/debian/watch2
-rw-r--r--ubuntu/_base/applications/office/knowit/debian/docs3
-rw-r--r--ubuntu/_base/applications/office/tellico/debian/docs2
-rw-r--r--ubuntu/_base/applications/settings/kdpkg/debian/docs1
-rw-r--r--ubuntu/_base/applications/settings/kima/debian/docs2
-rw-r--r--ubuntu/_base/applications/settings/kiosktool/debian/docs2
-rw-r--r--ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs2
-rw-r--r--ubuntu/_base/applications/settings/klcddimmer/debian/docs2
-rw-r--r--ubuntu/_base/applications/settings/tde-systemsettings/debian/docs8
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs1
-rw-r--r--ubuntu/_base/applications/settings/tdesudo/debian/docs2
-rw-r--r--ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs8
-rw-r--r--ubuntu/_base/applications/system/dolphin/debian/docs3
-rw-r--r--ubuntu/_base/applications/system/katapult/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/kcmautostart/debian/docs1
-rw-r--r--ubuntu/_base/applications/system/kdbusnotification/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/klamav/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/knemo/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/knetload/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/knetstats/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/kshutdown/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/ksystemlog/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/kvkbd/debian/docs1
-rw-r--r--ubuntu/_base/applications/system/smartcardauth/debian/docs1
-rw-r--r--ubuntu/_base/applications/system/tdesshaskpass/debian/docs1
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs2
-rw-r--r--ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-domino/debian/docs2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs4
-rw-r--r--ubuntu/_base/applications/utilities/filelight/debian/docs3
-rw-r--r--ubuntu/_base/applications/utilities/kchmviewer/debian/docs2
-rw-r--r--ubuntu/_base/applications/utilities/kdirstat/debian/docs2
-rw-r--r--ubuntu/_base/applications/utilities/keep/debian/docs2
-rw-r--r--ubuntu/_base/applications/utilities/knutclient/debian/docs3
-rw-r--r--ubuntu/_base/applications/utilities/krename/debian/docs2
-rw-r--r--ubuntu/_base/applications/utilities/ksensors/debian/docs2
-rw-r--r--ubuntu/_base/applications/utilities/mathemagics/debian/docs2
-rw-r--r--ubuntu/_base/common/cmake/debian/control2
-rw-r--r--ubuntu/_base/core/tdebase/debian/control2
-rw-r--r--ubuntu/_base/core/tdebindings/debian/control2
-rwxr-xr-xubuntu/_base/core/tdegraphics/debian/rules4
-rw-r--r--ubuntu/_base/core/tdetoys/debian/kweather-trinity.install9
-rw-r--r--ubuntu/_base/dependencies/akode/debian/docs2
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/changelog66
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/compat1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/control61
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/copyright101
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/docs1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install31
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install8
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/patches/series0
-rwxr-xr-xubuntu/_base/dependencies/polkit-tqt/debian/rules23
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/source/format1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/source/options6
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs2
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install3
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides23
-rwxr-xr-xubuntu/_base/dependencies/python-tqt/debian/rules12
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/watch3
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/control3
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 (renamed from debian/_base/dependencies/sip4-tqt/debian/manpages/sip.1)20
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages2
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install2
-rwxr-xr-xubuntu/_base/dependencies/sip4-tqt/debian/rules23
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py13
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py13
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/watch3
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/control21
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/dirs2
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/docs1
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install3
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install2
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install1
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install5
-rwxr-xr-xubuntu/_base/dependencies/tqscintilla/debian/rules129
-rwxr-xr-xubuntu/_base/dependencies/tqtinterface/debian/rules9
-rw-r--r--ubuntu/_base/libraries/libkexiv2/debian/docs2
-rw-r--r--ubuntu/_base/libraries/libtdeldap/debian/docs1
-rwxr-xr-xubuntu/_base/libraries/libtqt-perl/debian/rules1
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs2
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install2
-rwxr-xr-xubuntu/_base/libraries/python-trinity/debian/rules4
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/watch3
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/control2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm3
l---------ubuntu/jammy (renamed from debian/jessie)0
l---------ubuntu/trusty1
392 files changed, 4876 insertions, 4015 deletions
diff --git a/arch/PKGBUILD.template b/arch/PKGBUILD.template
index 8b1d87d1c..3df27ff30 100644
--- a/arch/PKGBUILD.template
+++ b/arch/PKGBUILD.template
@@ -4,8 +4,9 @@
_mod=tdepowersave
_cat=applications/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
pkgrel=1
pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
arch=('i686' 'x86_64')
@@ -17,12 +18,12 @@ depends=(
'tde-tdelibs'
)
makedepends=(
+ 'tde-cmake-trinity'
'autoconf'
- 'cmake'
'pkgconfig'
)
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
@@ -40,18 +41,19 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/build.sh b/arch/build.sh
index cdce2c1a8..e569a0096 100755
--- a/arch/build.sh
+++ b/arch/build.sh
@@ -17,10 +17,10 @@ compile_directory() {
}
### Build Packages
-compile_directory tde-core "tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca-tls libart-lgpl avahi-tqt tdelibs tdebase"
+compile_directory tde-core "cmake-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca tqca-tls libart-lgpl avahi-tqt tdelibs tdebase"
compile_directory tde-libs "libcaldav libcarddav libkdcraw libkexiv2"
-compile_directory tde-base "tdeartwork tdebindings tdegraphics tdeutils tdeadmin"
-compile_directory tde-extra "tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket kmplayer krusader ksplash-engine-moodin style-qtcurve tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal yakuake"
+compile_directory tde-base "i18n tdeartwork tdebindings tdegraphics tdeutils tdeadmin"
+compile_directory tde-extra "akode tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket kmplayer krusader ksplash-engine-moodin style-qtcurve tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal yakuake"
compile_directory tde-devel "tdesdk tdevelop tdewebdev"
### Copy completed packages to out folder and download dependencies to out folder
@@ -29,7 +29,7 @@ mkdir -p $tdesrc/out
cp $(find $tdesrc -name *.pkg.tar.zst) $tdesrc/out
wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/htdig-3.2.0b6-11-x86_64.pkg.tar.xz -O $tdesrc/out/htdig-3.2.0b6-11-x86_64.pkg.tar.xz
wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/lcms-1.19-7-x86_64.pkg.tar.xz -O $tdesrc/out/lcms-1.19-7-x86_64.pkg.tar.xz
-wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/pod2man-5.30.2-1-x86_64.pkg.tar.zst
+wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/pod2man-5.30.2-1-x86_64.pkg.tar.zst -O $tdesrc/out/pod2man-5.30.2-1-x86_64.pkg.tar.zst
wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/python2-lcms-1.19-7-x86_64.pkg.tar.xz -O $tdesrc/out/python2-lcms-1.19-7-x86_64.pkg.tar.xz
### Create trinity pacman repo
diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD
new file mode 100644
index 000000000..5d9fcec95
--- /dev/null
+++ b/arch/tde-base/tde-i18n/PKGBUILD
@@ -0,0 +1,148 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tde-i18n
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod/tde-}"
+pkgname=("$pkgbase")
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="Internationalized (i18n) files for TDE"
+arch=('any')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+makedepends=('tde-cmake-trinity')
+depends=('tde-tdelibs')
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a5a69fb9f1e4dae6852a68d4725ee6c3')
+install=''
+
+_languages=(
+ 'af "Afrikaans"'
+ 'ar "Arabic"'
+ 'az "Azerbaijani"'
+ 'be "Belarusian"'
+ 'bg "Bulgarian"'
+ 'bn "Bengali"'
+ 'br "Breton"'
+ 'bs "Bosnian"'
+ 'ca "Catalan"'
+ 'cs "Czech"'
+ 'csb "Kashubian"'
+ 'cy "Welsh"'
+ 'da "Danish"'
+ 'de "German"'
+ 'el "Greek"'
+ 'en_GB "English (British)"'
+ 'eo "Esperanto"'
+ 'es "Spanish"'
+ 'es_AR "Spanish (Argentina)"'
+ 'et "Estonian"'
+ 'eu "Basque"'
+ 'fa "Persian"'
+ 'fi "Finnish"'
+ 'fr "French"'
+ 'fy "Frisian"'
+ 'ga "Irish"'
+ 'gl "Galician"'
+ 'he "Hebrew"'
+ 'hi "Hindi"'
+ 'hr "Croatian"'
+ 'hu "Hungarian"'
+ 'is "Icelandic"'
+ 'it "Italian"'
+ 'ja "Japanese"'
+ 'kk "Kazakh"'
+ 'km "Khmer"'
+ 'ko "Korean"'
+ 'lt "Lithuanian"'
+ 'lv "Latvian"'
+ 'mk "Macedonian"'
+ 'mn "Mongolian"'
+ 'ms "Malay"'
+ 'nb "Norwegian Bokmål"'
+ 'nds "Low Saxon"'
+ 'nl "Dutch"'
+ 'nn "Norwegian Nynorsk"'
+ 'pa "Punjabi"'
+ 'pl "Polish"'
+ 'pt "Portuguese"'
+ 'pt_BR "Portuguese (Brazil)"'
+ 'ro "Romanian"'
+ 'ru "Russian"'
+ 'rw "Kinyarwanda"'
+ 'se "Northern Sami"'
+ 'sk "Slovak"'
+ 'sl "Slovenian"'
+ 'sr "Serbian"'
+ 'sr@Latn "Serbian Latin"'
+ 'ss "Swati"'
+ 'sv "Swedish"'
+ 'ta "Tamil"'
+ 'te "Telugu"'
+ 'tg "Tajik"'
+ 'th "Thai"'
+ 'tr "Turkish"'
+ 'uk "Ukrainian"'
+ 'uz "Uzbek"'
+ 'uz@cyrillic "Uzbek (Cyrillic)"'
+ 'vi "Vietnamese"'
+ 'wa "Walloon"'
+ 'zh_CN "Chinese (Simplified)"'
+ 'zh_TW "Chinese (Traditional)"'
+)
+
+_pkglangs=()
+for _lang in "${_languages[@]}"; do
+ _locale=${_lang%% *}
+ _pkglang=$(echo ${_locale,,} | tr '[:upper:]' '[:lower:]' | \
+ sed "s|@latn|latin|" | \
+ tr -d "_" | tr -d "@")
+ _pkgname=${pkgbase}-${_pkglang}
+
+ pkgname+=($_pkgname)
+ _pkglangs+=($_pkgname)
+ eval "package_$_pkgname() {
+ _package $_pkglang $_lang
+ }"
+done
+
+_package() {
+ pkgdesc="$3 ($2) internationalized (i18n) files for TDE"
+ provides=("${_mod}-${1}")
+ conflicts=("trinity-${_kdemod}-${1}" "kdemod3-${_kdemod}-${1}")
+ replaces=("trinity-${_mod}-${1}")
+
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="${pkgdir}" ninja -j1 install-${2/@/_}
+}
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON
+
+ msg "Building - ${pkgname#*-}..."
+ ninja $NUMJOBS
+}
+
+package_tde-i18n() {
+ pkgdesc="All languages (all) internationalized (i18n) files for TDE"
+ provides=("${_mod}")
+ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+ replaces=("trinity-${_mod}")
+ depends+=(${_pkglangs[@]})
+}
diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD
index 7dcd22bcf..8ad9aab9a 100644
--- a/arch/tde-base/tde-tdeadmin/PKGBUILD
+++ b/arch/tde-base/tde-tdeadmin/PKGBUILD
@@ -1,48 +1,52 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeadmin
-pkgver=14.0.10
+_mod=tdeadmin
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="The TDE system administration utilities"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeadmin-trinity-${pkgver}.tar.xz")
-md5sums=('401907e03f80ad2433614761af6978b1')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('1cdc7261b0a07b2b5767024ee699d852')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
- -DBUILD_KNETWORKCONF=OFF
+ -DBUILD_KNETWORKCONF=OFF \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD
index d5a66134c..5c4f59b62 100644
--- a/arch/tde-base/tde-tdeartwork/PKGBUILD
+++ b/arch/tde-base/tde-tdeartwork/PKGBUILD
@@ -1,48 +1,51 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeartwork
-pkgver=14.0.10
+_mod=tdeartwork
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdeartwork'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
pkgdesc="Trinity Desktop Development Ingegration Components - TDE upstream GIT"
depends=('tde-tdebase' 'xscreensaver' 'libxss')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=('tdeartwork')
-conflicts=('trinity-tdeartwork' 'trinity-kdeartwork')
-replaces=('trinity-tdeartwork')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeartwork-trinity-${pkgver}.tar.xz")
-md5sums=('71830a98f9d130a37ba1b3c6107fdd66')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('fc7ac94e49b18619699b7872339fe8d1')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD
index ecdbc822b..eadab5f96 100644
--- a/arch/tde-base/tde-tdebindings/PKGBUILD
+++ b/arch/tde-base/tde-tdebindings/PKGBUILD
@@ -3,26 +3,23 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdebindings
-pkgver=14.0.10
+_mod=tdebindings
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https//scm.trinitydesktop.org/scm/git/tdebindings'
+url="https//scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
pkgdesc="Trinity Desktop bindings"
depends=('tde-tdelibs')
makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby' 'jdk-openjdk' 'gtk2')
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebindings-trinity-${pkgver}.tar.xz"
- 'bp000-817f960e.diff'
- 'bp001-8301a3c8.diff'
- 'bp002-33697c89.diff')
-md5sums=('47294367d80fa79fefa80d755a6bf93d'
- '79e6de2ddfec059b7601fac3f3a1adc5'
- '8267435e92a265b83efbf07db5e36c01'
- 'feb8afbd1b3467c3e36f1dffb8c5ca53')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3f4933a66c0e1b32011148b9b4733579')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -31,11 +28,6 @@ build() {
## Generate config files and update with autoreconf
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- msg "Apply backported patches..."
- patch -p1 < ${srcdir}/bp000-817f960e.diff
- patch -p1 < ${srcdir}/bp001-8301a3c8.diff
- patch -p1 < ${srcdir}/bp002-33697c89.diff
-
msg "Copying system libtool files...."
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
diff --git a/arch/tde-base/tde-tdebindings/bp000-817f960e.diff b/arch/tde-base/tde-tdebindings/bp000-817f960e.diff
deleted file mode 100644
index e8d31b474..000000000
--- a/arch/tde-base/tde-tdebindings/bp000-817f960e.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 817f960e8ecca5074171cfc8267dcebbb1a7f514 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Mon, 10 May 2021 20:45:41 +0200
-Subject: Fix FTBFS on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Qt.cpp:2643:17: error: ordered comparison of pointer with integer zero ('void*' and 'int')
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- qtruby/rubylib/qtruby/Qt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
-index 834cc3b2..abb44588 100644
---- a/qtruby/rubylib/qtruby/Qt.cpp
-+++ b/qtruby/rubylib/qtruby/Qt.cpp
-@@ -2640,7 +2640,7 @@ isObject(VALUE /*self*/, VALUE obj)
- {
- void * ptr = 0;
- ptr = value_to_ptr(obj);
-- return (ptr > 0 ? Qtrue : Qfalse);
-+ return (ptr != 0 ? Qtrue : Qfalse);
- }
-
- static VALUE
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff b/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff
deleted file mode 100644
index b64ad2535..000000000
--- a/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff
+++ /dev/null
@@ -1,401 +0,0 @@
-From 8301a3c8e542675e9b5f310d79ad24b9a12baaf8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
-Date: Wed, 22 Sep 2021 20:38:45 +0200
-Subject: Add check whether Ruby requires explicit specification of C++
- standard.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
----
- korundum/bin/Makefile.am | 2 +
- korundum/configure.in.in | 90 +++++++++++++++++++++++++++++++
- korundum/rubylib/korundum/Makefile.am | 2 +
- korundum/rubylib/korundum/configure.in.in | 59 --------------------
- qtruby/bin/Makefile.am | 2 +
- qtruby/configure.in.in | 90 +++++++++++++++++++++++++++++++
- qtruby/rubylib/designer/uilib/Makefile.am | 2 +
- qtruby/rubylib/qtruby/Makefile.am | 2 +
- qtruby/rubylib/qtruby/configure.in.in | 59 --------------------
- 9 files changed, 190 insertions(+), 118 deletions(-)
- create mode 100644 korundum/configure.in.in
- delete mode 100644 korundum/rubylib/korundum/configure.in.in
- create mode 100644 qtruby/configure.in.in
- delete mode 100644 qtruby/rubylib/qtruby/configure.in.in
-
-diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am
-index 508f7731..47a8bb02 100644
---- a/korundum/bin/Makefile.am
-+++ b/korundum/bin/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- bin_PROGRAMS = krubyinit
-diff --git a/korundum/configure.in.in b/korundum/configure.in.in
-new file mode 100644
-index 00000000..c420adc9
---- /dev/null
-+++ b/korundum/configure.in.in
-@@ -0,0 +1,90 @@
-+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-+
-+if test -z "RUBY_EXECUTABLE"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
-+else
-+ RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-+ RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-+
-+ RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-+ RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-+ RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-+ RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-+ RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-+
-+ RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-+ if test "$RUBY_SERIES" -ge "19"; then
-+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-+ fi
-+
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-+ RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-+ else
-+ RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-+ RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-+ fi
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-+ else
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-+ fi
-+
-+ # check if Ruby requires explicit specification of C++ standard
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ SAVED_CXXFLAGS="$CXXFLAGS"
-+ for CXX_STD_TEST in "" 11 14 17; do
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ if test "x$CXX_STD_TEST" = "x"; then
-+ AC_MSG_CHECKING([Ruby build with default C++ standard])
-+ RUBY_CXXFLAGS=""
-+ else
-+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
-+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
-+ fi
-+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
-+ AC_TRY_COMPILE([
-+ #include <ruby.h>
-+ ],[ ],
-+ ruby_cxx_std=yes,
-+ ruby_cxx_std=no
-+ )
-+ if test "x$ruby_cxx_std" = "xyes"; then
-+ AC_SUBST(RUBY_CXXFLAGS)
-+ AC_MSG_RESULT(yes)
-+ break
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ done
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ AC_LANG_RESTORE
-+
-+ # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-+ RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-+ RUBY_SITEDIR=${RUBY_SITEDIR%/}
-+ RUBY_LIBDIR=${RUBY_LIBDIR%/}
-+ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-+
-+ AC_MSG_RESULT([\
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ rubylibdir $RUBY_RUBYLIBDIR,
-+ libdir $RUBY_LIBDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ cflags $RUBY_CFLAGS,
-+ cxxflags $RUBY_CXXFLAGS])
-+ AC_SUBST(RUBY_ARCHDIR)
-+ AC_SUBST(RUBY_SITEARCHDIR)
-+ AC_SUBST(RUBY_SITEDIR)
-+ AC_SUBST(RUBY_RUBYLIBDIR)
-+ AC_SUBST(RUBY_LIBDIR)
-+ AC_SUBST(RUBY_INCLUDEDIR)
-+ AC_SUBST(RUBY_LIBRUBYARG)
-+ AC_SUBST(RUBY_CFLAGS)
-+fi
-diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
-index 840b6ab6..74995c3d 100644
---- a/korundum/rubylib/korundum/Makefile.am
-+++ b/korundum/rubylib/korundum/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- rubylibdir = $(RUBY_ARCHDIR)
-diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
-deleted file mode 100644
-index 0a987639..00000000
---- a/korundum/rubylib/korundum/configure.in.in
-+++ /dev/null
-@@ -1,59 +0,0 @@
--AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
--
--if test -z "RUBY_EXECUTABLE"; then
-- DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
--else
-- RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-- RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
--
-- RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-- RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-- RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-- RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-- RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
--
-- RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-- if test "$RUBY_SERIES" -ge "19"; then
-- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-- fi
--
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-- RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-- else
-- RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-- RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-- fi
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-- else
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-- fi
--
-- # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-- RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-- RUBY_SITEDIR=${RUBY_SITEDIR%/}
-- RUBY_LIBDIR=${RUBY_LIBDIR%/}
-- RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
--
-- AC_MSG_RESULT([\
-- archdir $RUBY_ARCHDIR,
-- sitearchdir $RUBY_SITEARCHDIR,
-- sitedir $RUBY_SITEDIR,
-- rubylibdir $RUBY_RUBYLIBDIR,
-- libdir $RUBY_LIBDIR,
-- includedir $RUBY_INCLUDEDIR,
-- librubyarg $RUBY_LIBRUBYARG,
-- cflags $RUBY_CFLAGS])
-- AC_SUBST(RUBY_ARCHDIR)
-- AC_SUBST(RUBY_SITEARCHDIR)
-- AC_SUBST(RUBY_SITEDIR)
-- AC_SUBST(RUBY_RUBYLIBDIR)
-- AC_SUBST(RUBY_LIBDIR)
-- AC_SUBST(RUBY_INCLUDEDIR)
-- AC_SUBST(RUBY_LIBRUBYARG)
-- AC_SUBST(RUBY_CFLAGS)
--fi
--
-diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am
-index a1005f0b..988ba3d4 100644
---- a/qtruby/bin/Makefile.am
-+++ b/qtruby/bin/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- bin_PROGRAMS = qtrubyinit
-diff --git a/qtruby/configure.in.in b/qtruby/configure.in.in
-new file mode 100644
-index 00000000..84ad88ec
---- /dev/null
-+++ b/qtruby/configure.in.in
-@@ -0,0 +1,90 @@
-+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-+
-+if test -z "RUBY_EXECUTABLE"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
-+else
-+ RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-+ RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-+
-+ RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-+ RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-+ RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-+ RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-+ RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-+
-+ RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-+ if test "$RUBY_SERIES" -ge "19"; then
-+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-+ fi
-+
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-+ RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-+ else
-+ RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-+ RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-+ fi
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-+ else
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-+ fi
-+
-+ # check if Ruby requires explicit specification of C++ standard
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ SAVED_CXXFLAGS="$CXXFLAGS"
-+ for CXX_STD_TEST in "" 11 14 17; do
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ if test "x$CXX_STD_TEST" = "x"; then
-+ AC_MSG_CHECKING([Ruby build with default C++ standard])
-+ RUBY_CXXFLAGS=""
-+ else
-+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
-+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
-+ fi
-+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
-+ AC_TRY_COMPILE([
-+ #include <ruby.h>
-+ ],[ ],
-+ ruby_cxx_std=yes,
-+ ruby_cxx_std=no
-+ )
-+ if test "x$ruby_cxx_std" = "xyes"; then
-+ AC_SUBST(RUBY_CXXFLAGS)
-+ AC_MSG_RESULT(yes)
-+ break
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ done
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ AC_LANG_RESTORE
-+
-+ # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-+ RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-+ RUBY_SITEDIR=${RUBY_SITEDIR%/}
-+ RUBY_LIBDIR=${RUBY_LIBDIR%/}
-+ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-+
-+ AC_MSG_RESULT([\
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ rubylibdir $RUBY_RUBYLIBDIR,
-+ libdir $RUBY_LIBDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ cflags $RUBY_CFLAGS,
-+ cxxflags $RUBY_CXXFLAGS])
-+ AC_SUBST(RUBY_ARCHDIR)
-+ AC_SUBST(RUBY_SITEARCHDIR)
-+ AC_SUBST(RUBY_SITEDIR)
-+ AC_SUBST(RUBY_RUBYLIBDIR)
-+ AC_SUBST(RUBY_LIBDIR)
-+ AC_SUBST(RUBY_INCLUDEDIR)
-+ AC_SUBST(RUBY_LIBRUBYARG)
-+ AC_SUBST(RUBY_CFLAGS)
-+fi
-diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
-index 45876ed6..80363009 100644
---- a/qtruby/rubylib/designer/uilib/Makefile.am
-+++ b/qtruby/rubylib/designer/uilib/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- rubylibdir = $(RUBY_ARCHDIR)
-diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
-index 7083719c..c273c599 100644
---- a/qtruby/rubylib/qtruby/Makefile.am
-+++ b/qtruby/rubylib/qtruby/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb
-diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
-deleted file mode 100644
-index db0594a3..00000000
---- a/qtruby/rubylib/qtruby/configure.in.in
-+++ /dev/null
-@@ -1,59 +0,0 @@
--AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
--
--if test -z "RUBY_EXECUTABLE"; then
-- DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
--else
-- RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-- RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
--
-- RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-- RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-- RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-- RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-- RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
--
-- RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-- if test "$RUBY_SERIES" -ge "19"; then
-- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-- fi
--
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-- RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-- else
-- RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-- RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-- fi
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-- else
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-- fi
--
-- # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-- RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-- RUBY_SITEDIR=${RUBY_SITEDIR%/}
-- RUBY_LIBDIR=${RUBY_LIBDIR%/}
-- RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
--
-- AC_MSG_RESULT([\
-- archdir $RUBY_ARCHDIR,
-- sitearchdir $RUBY_SITEARCHDIR,
-- sitedir $RUBY_SITEDIR,
-- rubylibdir $RUBY_RUBYLIBDIR,
-- libdir $RUBY_LIBDIR,
-- includedir $RUBY_INCLUDEDIR,
-- librubyarg $RUBY_LIBRUBYARG,
-- cflags $RUBY_CFLAGS])
-- AC_SUBST(RUBY_ARCHDIR)
-- AC_SUBST(RUBY_SITEARCHDIR)
-- AC_SUBST(RUBY_SITEDIR)
-- AC_SUBST(RUBY_RUBYLIBDIR)
-- AC_SUBST(RUBY_LIBDIR)
-- AC_SUBST(RUBY_INCLUDEDIR)
-- AC_SUBST(RUBY_LIBRUBYARG)
-- AC_SUBST(RUBY_CFLAGS)
--fi
--
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff b/arch/tde-base/tde-tdebindings/bp002-33697c89.diff
deleted file mode 100644
index a559fec2a..000000000
--- a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 5092f046c4f6b678a728bb1156123e0f0e45380f
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Fri Sep 24 15:02:20 2021 +0200
-
- Fix FTBFS in dcopjava in case TQt3 is not installed in the system directory.
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
- (cherry picked from commit 33697c89a362c187fbf375c2d05b0a8d6beb9429)
-
-diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
-index be90dd10..2fe8e5d5 100644
---- a/dcopjava/binding/Makefile.am
-+++ b/dcopjava/binding/Makefile.am
-@@ -1,8 +1,8 @@
- lib_LTLIBRARIES = libjavadcop.la
-
- libjavadcop_la_SOURCES = client.cpp
--libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
--libjavadcop_la_LIBADD = $(LIB_TDECORE)
-+libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN)
-+libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
-
- INCLUDES = $(jni_includes) $(all_includes)
-
diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD
index 29618eb11..4ab9cdbfc 100644
--- a/arch/tde-base/tde-tdegraphics/PKGBUILD
+++ b/arch/tde-base/tde-tdegraphics/PKGBUILD
@@ -1,54 +1,63 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: e1z0 <marcinkeviciusjustinas at gmail dot com>
-pkgname=tde-tdegraphics
-pkgver=14.0.10
-pkgrel=1
+_mod=tdegraphics
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=2
pkgdesc="Trinity Desktop Graphics Components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdegraphics'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
-depends=('tde-tdelibs' 'libgphoto2' 'fribidi' 'sane')
-makedepends=('pkgconfig' 'cmake' 'imlib')
-provides=('tdegraphics')
-conflicts=('trinity-tdegraphics' 'trinity-kdegraphics')
-replaces=('trinity-tdegraphics')
+depends=('tde-tdelibs' 'fribidi' 'imlib' 'libgphoto2' 'libpaper' 'poppler' 'sane' 't1lib')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegraphics-trinity-${pkgver}.tar.xz"
- 'bp000-d19460fd6e.diff'
- 'bp001-866f96c1f4.diff')
-md5sums=('0b069eb140a9f8b8bbe4556f1bd313d9'
- 'c5ccbf331b4b0b6a0af61687cc3308a5'
- 'bd4a586fb17963697afceef79adc35a5')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
+ "bp000-544868bcc9.diff")
+md5sums=('04d2c95040a3a5664c4b0dca8556d10d'
+ "17ef39c263fb05827242762813b8c4b2")
# install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
-build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-d19460fd6e.diff
- patch -p1 < ${srcdir}/bp001-866f96c1f4.diff
+prepare() {
+ msg "Apply backported patches"
+ cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
+ patch -p1 < ${srcdir}/bp000-544868bcc9.diff
+}
- cd $srcdir
+build() {
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_T1LIB=ON \
+ -DWITH_PAPER=ON \
+ -DWITH_TIFF=ON \
+ -DWITH_OPENEXR=ON \
+ -DWITH_PDF=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff b/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff
new file mode 100644
index 000000000..975fd5224
--- /dev/null
+++ b/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff
@@ -0,0 +1,60 @@
+commit 9cde144216b331f0eef2ce2c3800d8356109ccc7
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date: Wed Dec 15 17:30:53 2021 +0100
+
+ Add support for Poppler >= 21.11.
+ This resolves issue #36.
+
+ Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+
+diff --git a/config.h.cmake b/config.h.cmake
+index b3b6d1ec..fa71d600 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -1,6 +1,7 @@
+ #cmakedefine VERSION "@VERSION@"
+
+ // poppler-tqt
++#cmakedefine HAVE_POPPLER_2111
+ #cmakedefine HAVE_POPPLER_2108
+ #cmakedefine HAVE_POPPLER_086
+ #cmakedefine HAVE_POPPLER_083
+diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+index 9c15e64f..78f6ffbc 100644
+--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
++++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+@@ -24,7 +24,7 @@ check_cxx_source_compiles("
+ HAVE_POPPLER_030 )
+ tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+
+-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 )
++foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 )
+ string( REPLACE "." "" _poppler_str "${_poppler_ver}" )
+ if( NOT DEFINED HAVE_POPPLER_${_poppler_str} )
+ message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" )
+diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
+index 426b750f..9b4f6208 100644
+--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
+@@ -173,7 +173,11 @@ TQValueList<TextBox*> Page::textList() const
+ data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72,
+ 0, false, false, false, -1, -1, -1, -1);
+
++# if defined(HAVE_POPPLER_2111)
++ std::unique_ptr<TextWordList> word_list = output_dev->makeWordList();
++# else
+ TextWordList *word_list = output_dev->makeWordList();
++# endif
+
+ if (!word_list) {
+ delete output_dev;
+@@ -193,7 +197,9 @@ TQValueList<TextBox*> Page::textList() const
+ output_list.append(text_box);
+ }
+
++# if !defined(HAVE_POPPLER_2111)
+ delete word_list;
++# endif
+ delete output_dev;
+
+ return output_list;
diff --git a/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff b/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff
deleted file mode 100644
index 1565ee3f2..000000000
--- a/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From d19460fd6eae693832e4c5160aa2071bf71062f6 Mon Sep 17 00:00:00 2001
-From: Mavridis Philippe <mavridisf@gmail.com>
-Date: Thu, 8 Jul 2021 23:14:10 +0300
-Subject: Corrected boolean usage to conform with C++17 standard.
-
-This resolves a FTBFS on some systems.
-
-Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
----
- kfaxview/libkfaximage/faxinit.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kfaxview/libkfaximage/faxinit.cpp b/kfaxview/libkfaximage/faxinit.cpp
-index aa6166aa..fa4517d2 100644
---- a/kfaxview/libkfaximage/faxinit.cpp
-+++ b/kfaxview/libkfaximage/faxinit.cpp
-@@ -319,11 +319,11 @@ FillTable(struct tabent *T, int Size, const struct proto *P, int State)
- void
- fax_init_tables(void)
- {
-- static bool already_initialized = 0;
-+ static bool already_initialized = false;
- if (already_initialized)
- return;
-
-- ++already_initialized;
-+ already_initialized = true;
-
- FillTable(MainTable, 7, Pass, S_Pass);
- FillTable(MainTable, 7, Horiz, S_Horiz);
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff b/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff
deleted file mode 100644
index 3508d7437..000000000
--- a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-From 866f96c1f45c0d8302267c3bc3b286369cf9dcfe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
-Date: Thu, 8 Jul 2021 19:46:45 +0200
-Subject: Use FindOpenGL instead of pkg_search_module( GLU ). This resolves
- FTBFS on FreeBSD 13.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
----
- kpovmodeler/CMakeLists.txt | 4 ++--
- kpovmodeler/ConfigureChecks.cmake | 9 +++++----
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
-index 6ec98ae4..b589117f 100644
---- a/kpovmodeler/CMakeLists.txt
-+++ b/kpovmodeler/CMakeLists.txt
-@@ -19,7 +19,7 @@ include_directories(
- ${CMAKE_BINARY_DIR}
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-- ${GLU_INCLUDE_DIRS}
-+ ${OPENGL_INCLUDE_DIRS}
- ${FREETYPE_INCLUDE_DIRS}
- )
-
-@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
- pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
- pmpartiface.skel
- VERSION 0.0.0
-- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
-+ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
-diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake
-index f4fdd1c0..a55045d4 100644
---- a/kpovmodeler/ConfigureChecks.cmake
-+++ b/kpovmodeler/ConfigureChecks.cmake
-@@ -10,13 +10,14 @@
- #################################################
-
- # glu
--pkg_search_module( GLU glu )
--if( NOT GLU_FOUND )
-+set( OpenGL_GL_PREFERENCE LEGACY )
-+find_package( OpenGL )
-+if( NOT OPENGL_FOUND )
- check_include_file ( GL/glu.h HAVE_GLU )
- if( NOT HAVE_GLU )
-- tde_message_fatal( "glu is required, but was not found on your system" )
-+ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" )
- endif ( )
-- set( GLU_LIBRARIES "-lGL -lGLU" )
-+ set( OPENGL_LIBRARIES "-lGL -lGLU" )
- endif( )
-
-
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD
index 46126989c..d3c4ea03b 100644
--- a/arch/tde-base/tde-tdeutils/PKGBUILD
+++ b/arch/tde-base/tde-tdeutils/PKGBUILD
@@ -1,46 +1,50 @@
# Maintainer: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeutils
-pkgver=14.0.10
+_mod=tdeutils
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="The TDE something - with Trinity upstream"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
depends=('tde-tdebase' 'xmms2')
-makedepends=('pkgconfig' 'cmake' 'python2')
+makedepends=('tde-cmake-trinity' 'python2')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeutils-trinity-${pkgver}.tar.xz")
-md5sums=('95e778a8775b416739fd7e836e4ecdcd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('9d5bc073642e7f540f9c168e7d8ea989')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}
msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
## cmake call
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON \
-DWITH_DPMS=ON \
- -DBUILD_ALL=ON
+ -DWITH_XSCREENSAVER=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD
index e58281542..285e29f57 100644
--- a/arch/tde-core/tde-arts/PKGBUILD
+++ b/arch/tde-core/tde-arts/PKGBUILD
@@ -3,12 +3,16 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-arts
-pkgver=14.0.10
+_mod=arts
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
-pkgdesc="Trinity ARTS Sound System and libraries"
+pkgdesc="Trinity aRts Sound System and libraries"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/arts'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
depends=('alsa-plugins'
@@ -21,39 +25,41 @@ depends=('alsa-plugins'
'libvorbis'
'pulseaudio-alsa'
'tde-tqtinterface')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=('audio-convert: A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma'
'lame: A high quality MPEG Audio Layer III (MP3) encoder'
'libmp3splt: Library for splitting mp3 and ogg files without decoding'
'mpd: Music daemon that plays MP3, FLAC, and Ogg Vorbis files'
'vorbis-tools: Extra tools for Ogg-Vorbis')
-provides=('arts')
-conflicts=('kdemod3-arts' 'arts')
-replaces=('trinity-arts')
+provides=("${_mod}")
+conflicts=("kdemod3-${_mod}" "${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/arts-trinity-${pkgver}.tar.xz")
-md5sums=('d9d719e824acd5397dda709ed5352feb')
-install='tde-arts.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('8906e1030ed7caa3ce72e8c41288b320')
+install="tde-${_mod}.install"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_ESOUND=OFF \
+ -DWITH_JACK=OFF
msg "Building $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD
index 2df40dd16..737408364 100644
--- a/arch/tde-core/tde-avahi-tqt/PKGBUILD
+++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD
@@ -1,42 +1,46 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-avahi-tqt
-pkgver=14.0.10
+_mod=avahi-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="Trinity Avahi-TQt"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/avahi-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
depends=('tde-tqtinterface' 'avahi' 'nss-mdns')
# nss-mdns should probably move to tdelibs depends
-makedepends=('pkgconfig' 'cmake')
-provides=('avahi-tqt')
-replaces=('trinity-avahi-tqt')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('6cce8423a3030505bb56a8c73f6235d6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('e9e31775dc7ad94159e9e8ea0edf028c')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-core/tde-cmake-trinity/PKGBUILD b/arch/tde-core/tde-cmake-trinity/PKGBUILD
new file mode 100644
index 000000000..bc3fc1031
--- /dev/null
+++ b/arch/tde-core/tde-cmake-trinity/PKGBUILD
@@ -0,0 +1,51 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=cmake-trinity
+_cat=common/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=2
+pkgdesc="TDE CMake modules"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/tde-common-cmake"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-core')
+depends=(
+ 'cmake'
+ 'perl'
+ 'ninja'
+ 'pkgconfig'
+)
+makedepends=()
+optdepends=()
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz")
+md5sums=('954185aabae978ef840c78efd940bee0')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${_mod}-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+
+ msg "Building - ${pkgname}..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - ${pkgname}-${pkgver}"
+ cd "$srcdir/build"
+ DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
index 907060c9f..cedb30c85 100644
--- a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
+++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
@@ -3,43 +3,47 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-dbus-1-tqt
-pkgver=14.0.10
-pkgrel=1
+_mod=dbus-1-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=2
pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/dbus-1-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core' 'tde-base')
depends=('tde-tqtinterface' 'dbus')
-makedepends=('pkgconfig' 'cmake')
-provides=('dbus-1-tqt')
-conflicts=('trinity-dbus-1-tqt')
-replaces=('trinity-dbus-1-tqt' 'trinity-dbus-1-qt3' 'dbus-1-qt3' 'tde-dbus-tqt-1')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3')
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-1-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('4954efb83544c72272ba803eb44b72ec')
-install='trinity-dbus-1-tqt.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('c801be15308438c85043d5f52f28bcc9')
+install="trinity-${_mod}.install"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD
index 7e1c73d32..8c96c3944 100644
--- a/arch/tde-core/tde-dbus-tqt/PKGBUILD
+++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD
@@ -3,41 +3,44 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-dbus-tqt
-pkgver=14.0.10
+_mod=dbus-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/dbus-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
pkgdesc="Trinity TQt DBus wrapper"
depends=('tde-tqtinterface' 'dbus')
-makedepends=('pkgconfig' 'cmake')
-provides=('dbus-tqt')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('5a3577b3f43b3cfeb4701bb4a4e0a951')
-install='trinity-dbus-tqt.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('fd23c1a0f57d7ed08f443b3e2a2f98d6')
+install="trinity-${_mod}.install"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
- -DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_GCC_VISIBILITY=ON
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=$TDEDIR
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD
index c6f03a951..6edf7368c 100644
--- a/arch/tde-core/tde-libart-lgpl/PKGBUILD
+++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD
@@ -1,24 +1,28 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-libart-lgpl
-pkgver=14.0.10
+_mod=libart-lgpl
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="Trinity Desktop LGPL'd Component"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libart-lgpl"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('LGPL')
groups=('tde-core')
#depends=('')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=('libart-lgpl')
+provides=("${_mod}")
conflicts=()
replaces=()
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libart-lgpl-trinity-${pkgver}.tar.xz")
-md5sums=('e3cae1bd69671c21b27d10bd9b29bb8c')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('02e9f48e719c1a189638ddb1f932cea3')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -30,15 +34,16 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DWITH_GCC_VISIBILITY=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD
index 85f569247..10a18556e 100644
--- a/arch/tde-core/tde-tdebase/PKGBUILD
+++ b/arch/tde-core/tde-tdebase/PKGBUILD
@@ -1,16 +1,19 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname='tde-tdebase'
-pkgver=14.0.10
-pkgrel=2
+_mod=tdebase
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
pkgdesc="Trinity Desktop Enviroment base components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdebase'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
-provides=('tdebase')
+provides=("${_mod}")
groups=('tde-core')
-# depends=('hal'
depends=('libraw1394'
'libxtst'
'libxss'
@@ -23,15 +26,12 @@ depends=('libraw1394'
'xorg-xinit'
'htdig'
'openssl-1.0')
-makedepends=('autoconf'
- 'cmake'
- 'imake'
- 'pkgconfig'
- 'libxkbfile'
- 'smbclient'
- 'rpcsvc-proto'
- 'xorg-bdftopcf'
- 'xscreensaver')
+makedepends=('tde-cmake-trinity'
+ 'libxkbfile'
+ 'smbclient'
+ 'rpcsvc-proto'
+ 'xorg-bdftopcf'
+ 'xscreensaver')
optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
'pciutils: PCI bus configuration space access library and tools'
'samba: file sharing over SMB'
@@ -44,12 +44,12 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)'
'xorg-fonts-75dpi: X.org 75dpi fonts collection'
'xscreensaver: Screen saver and locker for the X Window System')
-confilicts=('trinity-kdebase ''kdemod3-kdebase')
-replaces=('trinity-tdebase')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-install='trinity-tdebase.install'
+install="trinity-${_mod}.install"
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
'agent-shutdown.sh'
'agent-startup.sh'
'tdm-trinity'
@@ -57,7 +57,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/
'tdm.service'
'xsession.patch')
-md5sums=('bca895dfc2b88c4b74e307d5690108bf'
+md5sums=('38d71c4d3fa51219b4f734b9d862308e'
'18e8d01124b19f7df2937c06e177bf7f'
'c963ef6e37c9051119972a58c67f05fb'
'bb4c25e560fa719e8e8f49ef80bd1c99'
@@ -68,16 +68,16 @@ md5sums=('bca895dfc2b88c4b74e307d5690108bf'
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DWITH_SASL=ON \
@@ -89,8 +89,6 @@ build() {
-DWITH_XFIXES=ON \
-DWITH_XRANDR=ON \
-DWITH_XRENDER=ON \
- -DWITH_XDAMAGE=ON \
- -DWITH_XEXT=ON \
-DWITH_XTEST=ON \
-DWITH_OPENGL=ON \
-DWITH_XSCREENSAVER=ON \
@@ -111,13 +109,13 @@ build() {
-DTDM_PAM_SERVICE=tde \
-DTDESCREENSAVER_PAM_SERVICE=tde-screensaver
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd $srcdir/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
# install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions)
install -d -m755 ${pkgdir}/usr/share/xsessions
diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD
index 759b18d6a..f63821c0e 100644
--- a/arch/tde-core/tde-tdelibs/PKGBUILD
+++ b/arch/tde-core/tde-tdelibs/PKGBUILD
@@ -3,12 +3,16 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdelibs
-pkgver=14.0.10
+_mod=tdelibs
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=2
pkgdesc="Trinity Desktop core libraries and applications"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdelibs'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
depends=('aspell'
@@ -32,29 +36,28 @@ depends=('aspell'
'xorg-xprop'
'xorg-xset'
'xorg-xsetroot')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdelibs')
-conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3')
-replaces=('trinity-kdelibs' 'trinity-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}3")
+replaces=("trinity-${_kdemod}" "trinity-${_mod}")
options=('staticlibs' 'libtool' '!makeflags' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdelibs-trinity-${pkgver}.tar.xz")
-
-md5sums=('cbb77407a886b588b4749524ae8e5edd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6a93917c4879d0a34764264f53e8519f')
-install='trinity-tdelibs.install'
+install="trinity-${_mod}.install"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -84,13 +87,13 @@ build() {
-DWITH_HSPELL=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
msg "Removing conflicting images"
rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
}
diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD
index 52b19c726..36be28cd2 100644
--- a/arch/tde-core/tde-tqca-tls/PKGBUILD
+++ b/arch/tde-core/tde-tqca-tls/PKGBUILD
@@ -3,45 +3,51 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tqca-tls
-pkgver=14.0.10
+_mod=tqca-tls
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tqca-tls'
+url="https://scm.trinitydesktop.org/scm/git/${_mod%-tls}"
license=('GPL')
groups=('tde-core')
depends=('tde-tqtinterface' 'openssl-1.0')
-makedepends=('pkgconfig' 'cmake')
-provides=('tqca-tls')
-conflicts=('trinity-tqca-tls')
-replaces=('trinity-tqca-tls')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqca-tls-trinity-${pkgver}.tar.xz")
-md5sums=('6347f50dd8b44cc1f7a35329bd578ba1')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz")
+md5sums=('2b149701a8ad80d4ea69f97f83089b8a')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
- cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ cmake ${srcdir}/${_mod%-tls}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_GCC_VISIBILITY=ON
+ -DBUILD_ALL=OFF \
+ -DBUILD_TQCA_TLS=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD
new file mode 100644
index 000000000..7cfb78540
--- /dev/null
+++ b/arch/tde-core/tde-tqca/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tqca
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+depends=('tde-tqtinterface' 'openssl-1.0')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2b149701a8ad80d4ea69f97f83089b8a')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
+
+ export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=$QTDIR \
+ -DBUILD_ALL=OFF \
+ -DBUILD_TQCA=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building - $pkgname..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD
index 0f56bd687..9fca983df 100644
--- a/arch/tde-core/tde-tqt3/PKGBUILD
+++ b/arch/tde-core/tde-tqt3/PKGBUILD
@@ -3,13 +3,17 @@
# Contributor: Calvin Morrison <MutantTurkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgbase=tde-tqt3
+_mod=tqt3
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod}"
pkgname=("$pkgbase" "${pkgbase}-docs")
-pkgver=14.0.10
+pkgver=14.0.11
pkgrel=1
pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqt3"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
options=('staticlibs' 'libtool' '!emptydirs' '!strip')
@@ -22,19 +26,16 @@ makedepends=('libcups'
'libmng'
'xorg-xrandr'
'libxft'
+ 'libxmu'
'glu')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqt3-trinity-${pkgver}.tar.xz"
- 'bp000-fix-build-key.diff')
-md5sums=('47d8495fcf444c5db2cf56843be3f746'
- '950e3885135fd9844de856c770f19767')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3923dc1a1460c556ef5d1fc296211f3a')
_prefix="/opt/trinity/tqt3"
build() {
- cd ${srcdir}/tqt3-trinity-${pkgver}
-
- patch -p1 < ${srcdir}/bp000-fix-build-key.diff
+ cd ${srcdir}/${_mod}-trinity-${pkgver}
# These are probably arch-specific. They were present in old qt3
# PKGBULD, they were present in kdemod3 PKGBUILD, they are present
@@ -54,7 +55,7 @@ build() {
sed -i "s|read acceptance|acceptance=yes|" configure
msg "Setting enviroment variables..."
- export QTDIR="${srcdir}/tqt3-trinity-${pkgver}"
+ export QTDIR="${srcdir}/${_mod}-trinity-${pkgver}"
export PATH=${QTDIR}/bin:${PATH}
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
export QMAKESPEC=$QTDIR/mkspecs/linux-g++
@@ -94,6 +95,7 @@ build() {
-platform linux-g++${ARCH} \
-no-exceptions \
-thread \
+ -enable-opengl \
-dlopen-opengl \
-no-ipv6
@@ -146,8 +148,8 @@ package_tde-tqt3() {
make INSTALL_ROOT="$pkgdir" install
- ## remove doc as it is now in a split package tde-tqt3-doc
- rm -r "${pkgdir}${_prefix}/doc"
+ ## remove doc as it is now in a split package tde-tqt3-doc
+ rm -r "${pkgdir}${_prefix}/doc"
# install link the apps provided by qt3 so we don't collide with
# qt4 and can run them.
diff --git a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff b/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff
deleted file mode 100644
index a0a0aa42e..000000000
--- a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Wed Sep 22 15:00:08 2021 +0200
-
- Fix buildkey for GCC >= 7 if the version is listed including minor numbers.
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-
-diff --git a/configure b/configure
-index 92cec273..f021f563 100755
---- a/configure
-+++ b/configure
-@@ -2828,7 +2828,7 @@ g++*)
- 3.*)
- COMPILER_VERSION="3.*"
- ;;
-- [1-9][0-9]|[7-9]|[4-6].*)
-+ [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*)
- COMPILER_VERSION="4.*"
- ;;
- *)
diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD
index 43774f594..6d59ac7c7 100644
--- a/arch/tde-core/tde-tqtinterface/PKGBUILD
+++ b/arch/tde-core/tde-tqtinterface/PKGBUILD
@@ -3,34 +3,34 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tqtinterface
-pkgver=14.0.10
+_mod=tqtinterface
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqtinterface"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL2')
groups=('tde-core')
pkgdesc="TQt interface for the TDE desktop"
depends=('tde-tqt3' 'glu')
-makedepends=('pkgconfig' 'cmake')
-provides=('tqtinterface')
-conflicts=('kdemod3-tqtinterface' 'trinity-tqtinterface')
-replaces=('trinity-tqtinterface')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
# makeopts=('libtool' '!emptydirs' '!strip')
options=('staticlibs' 'libtool' '!emptydirs' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqtinterface-trinity-${pkgver}.tar.xz"
- 'tqtpc-location.patch')
-
-md5sums=('76b04fce54a40edf46a7421a5f3e176f'
- 'c15745c944d98cb7c4cb553f0ca421d4')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4f2001045468bce4483819d91fef113a')
-install='trinity-tqtinterface.install'
+install="trinity-${_mod}.install"
_prefix=/usr
-_tdedir=/opt/trinity
-
-[ -n "$QTDIR" ] || QTDIR=${_tdedir}/tqt3
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
cd $srcdir
@@ -38,24 +38,27 @@ build() {
mkdir -p build
cd build
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DQT_PREFIX_DIR=${QTDIR} \
-DQT_INCLUDE_DIR=${QTDIR}/include \
-DMOC_EXECUTABLE=${QTDIR}/bin/moc \
-DQT_VERSION=3
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
# Create and install ld.so.conf.d file
install -d -m755 $pkgdir/etc/ld.so.conf.d/
- echo ${_tdedir}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
- echo ${_tdedir}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
+ echo ${TDEDIR}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
+ echo ${TDEDIR}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
}
diff --git a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch b/arch/tde-core/tde-tqtinterface/tqtpc-location.patch
deleted file mode 100644
index f256e925c..000000000
--- a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dependencies/tqtinterface/CMakeLists.txt 2011-03-28 00:12:24.000000000 +0200
-+++ dependencies/tqtinterface/CMakeLists.txt.new 2012-01-29 12:15:16.000000000 +0100
-@@ -35,7 +35,7 @@
- tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" )
- tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
- tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/tqt" )
--tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
-+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" )
-
-
- ##### tqtinterface sources ######################
diff --git a/arch/tde-devel/tde-tdesdk/PKGBUILD b/arch/tde-devel/tde-tdesdk/PKGBUILD
index eeff69672..14b9b1e79 100644
--- a/arch/tde-devel/tde-tdesdk/PKGBUILD
+++ b/arch/tde-devel/tde-tdesdk/PKGBUILD
@@ -1,46 +1,49 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdesdk
-pkgver=14.0.10
+_mod=tdesdk
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdesdk'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-devel')
pkgdesc="Trinity Desktop Development Tools"
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'flex' 'subversion' 'pod2man')
-provides=('tdesdk')
-conflicts=('trinity-tdesdk' 'trinity-kdesdk')
-replaces=('trinity-tdesdk')
+makedepends=('tde-cmake-trinity' 'flex' 'subversion' 'pod2man')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdesdk-trinity-${pkgver}.tar.xz")
-md5sums=('5d117cbbe1cd938624656917646eebab')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('36895ffc0ee52be3c30bfef9019cf424')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-devel/tde-tdevelop/PKGBUILD b/arch/tde-devel/tde-tdevelop/PKGBUILD
index 56a4ecc2c..db57ea73b 100644
--- a/arch/tde-devel/tde-tdevelop/PKGBUILD
+++ b/arch/tde-devel/tde-tdevelop/PKGBUILD
@@ -1,53 +1,51 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdevelop
-pkgver=14.0.10
+_mod=tdevelop
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdevelop'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-devel')
pkgdesc="Trinity Desktop Developer Tools"
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'tde-tdesdk' 'subversion')
-provides=('tdevelop')
-conflicts=('trinity-tdevelop' 'trinity-kdevelop')
-replaces=('trinity-tdevelop')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk' 'subversion')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdevelop-trinity-${pkgver}.tar.xz"
- 'bp000-ba5f58bf.diff')
-md5sums=('ec9eb0b745d984bf77f74bdc959d5fc8'
- 'e7519ea06bd63b4fc9aa7e0ac5076576')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2323f9116e354a28e72da92a4f820641')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-ba5f58bf.diff
-
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p ${srcdir}/build
cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
+ -DBUILD_ALL=ON \
-DWITH_BUILDTOOL_ALL=ON \
-DWITH_LANGUAGE_ALL=ON \
- -DWITH_VCS_ALL=ON \
- -DBUILD_ALL=ON
+ -DWITH_VCS_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff b/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff
deleted file mode 100644
index 9cd176d3a..000000000
--- a/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff
+++ /dev/null
@@ -1,1238 +0,0 @@
-From ba5f58bf38a62eb83990951168951274c96a8e24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Sun, 28 Feb 2021 00:15:56 +0000
-Subject: Fix ftbfs on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: reference to ‘data’ is ambiguous
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- buildtools/ada/adaproject_part.cpp | 6 +++---
- buildtools/ant/antprojectpart.cpp | 6 +++---
- buildtools/autotools/autoprojectpart.cpp | 6 +++---
- buildtools/custommakefiles/customprojectpart.cpp | 6 +++---
- buildtools/pascal/pascalproject_part.cpp | 6 +++---
- buildtools/qmake/trollprojectpart.cpp | 6 +++---
- buildtools/script/scriptprojectpart.cpp | 6 +++---
- editors/editor-chooser/editorchooser_part.cpp | 6 +++---
- embedded/visualboyadvance/visualboyadvance_part.cpp | 6 +++---
- languages/ada/adasupportpart.cpp | 6 +++---
- languages/bash/bashsupport_part.cpp | 6 +++---
- languages/cpp/app_templates/kdevpart/kdevpart_part.cpp | 6 +++---
- languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp | 6 +++---
- languages/cpp/cppsupportfactory.cpp | 6 +++---
- languages/csharp/csharpsupportpart.cpp | 6 +++---
- languages/fortran/fortransupportpart.cpp | 6 +++---
- languages/java/javasupportfactory.cpp | 6 +++---
- languages/kjssupport/kjssupport_part.cpp | 6 +++---
- languages/pascal/pascalsupport_part.cpp | 6 +++---
- languages/perl/perlsupportpart.cpp | 6 +++---
- languages/php/phpsupportpart.cpp | 6 +++---
- languages/python/pythonsupportpart.cpp | 6 +++---
- languages/ruby/rubysupport_part.cpp | 6 +++---
- languages/sql/sqlsupport_part.cpp | 6 +++---
- lib/interfaces/kdevgenericfactory.h | 8 ++++----
- parts/astyle/astyle_part.cpp | 6 +++---
- parts/bookmarks/bookmarks_part.cpp | 6 +++---
- parts/classview/classviewpart.cpp | 8 ++++----
- parts/ctags2/ctags2_part.cpp | 6 +++---
- parts/diff/diffpart.cpp | 6 +++---
- parts/distpart/distpart_part.cpp | 6 +++---
- parts/documentation/documentation_part.cpp | 6 +++---
- parts/doxygen/doxygenpart.cpp | 6 +++---
- parts/filecreate/filecreate_part.cpp | 8 ++++----
- parts/fileselector/fileselector_part.cpp | 6 +++---
- parts/fileview/filegroupspart.cpp | 6 +++---
- parts/fileview/fileviewpart.cpp | 6 +++---
- parts/filter/filterpart.cpp | 6 +++---
- parts/fullscreen/fullscreen_part.cpp | 6 +++---
- parts/outputviews/appoutputviewpart.cpp | 6 +++---
- parts/outputviews/makeviewpart.cpp | 6 +++---
- parts/partexplorer/partexplorer_plugin.cpp | 6 +++---
- parts/quickopen/quickopen_part.cpp | 6 +++---
- parts/regexptest/regexptestpart.cpp | 6 +++---
- parts/scripting/scriptingpart.cpp | 6 +++---
- parts/snippet/snippet_part.cpp | 6 +++---
- parts/texttools/texttoolspart.cpp | 6 +++---
- parts/tipofday/tipofday_part.cpp | 6 +++---
- parts/tools/tools_part.cpp | 6 +++---
- parts/uimode/uichooser_part.cpp | 6 +++---
- parts/valgrind/valgrind_part.cpp | 6 +++---
- parts/vcsmanager/vcsmanagerpart.cpp | 6 +++---
- vcs/clearcase/clearcasepart.cpp | 6 +++---
- vcs/cvsservice/cvspart.cpp | 6 +++---
- vcs/perforce/perforcepart.cpp | 6 +++---
- vcs/subversion/subversion_part.cpp | 6 +++---
- 56 files changed, 171 insertions(+), 171 deletions(-)
-
-diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
-index 5eacf5d0..f778c9b2 100644
---- a/buildtools/ada/adaproject_part.cpp
-+++ b/buildtools/ada/adaproject_part.cpp
-@@ -43,11 +43,11 @@
- #include "adaglobaloptionsdlg.h"
-
- typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory;
--static const KDevPluginInfo data("kdevadaproject");
--K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevadaproject");
-+K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( pluginData ) )
-
- AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& )
-- :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
-+ :KDevBuildTool(&pluginData, parent, name ? name : "AdaProjectPart" )
- {
- setInstance(AdaProjectFactory::instance());
- setXMLFile("kdevadaproject.rc");
-diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
-index a9e5a2d4..f53357da 100644
---- a/buildtools/ant/antprojectpart.cpp
-+++ b/buildtools/ant/antprojectpart.cpp
-@@ -35,8 +35,8 @@
-
-
- typedef KDevGenericFactory<AntProjectPart> AntProjectFactory;
--static const KDevPluginInfo data("kdevantproject");
--K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data ))
-+static const KDevPluginInfo pluginData("kdevantproject");
-+K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( pluginData ))
-
-
- AntOptions::AntOptions()
-@@ -46,7 +46,7 @@ AntOptions::AntOptions()
-
-
- AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevBuildTool(&data, parent, name ? name : "AntProjectPart")
-+ : KDevBuildTool(&pluginData, parent, name ? name : "AntProjectPart")
- {
- setInstance(AntProjectFactory::instance());
-
-diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
-index 014e8e2f..c1008072 100644
---- a/buildtools/autotools/autoprojectpart.cpp
-+++ b/buildtools/autotools/autoprojectpart.cpp
-@@ -62,12 +62,12 @@
- #define RUN_OPTIONS 2
- #define MAKE_OPTIONS 3
-
--static const KDevPluginInfo data("kdevautoproject");
-+static const KDevPluginInfo pluginData("kdevautoproject");
-
--K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( pluginData ) )
-
- AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args)
-- : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
-+ : KDevBuildTool(&pluginData, parent, name ? name : "AutoProjectPart")
- , m_lastCompilationFailed(false)
- {
- setInstance(AutoProjectFactory::instance());
-diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
-index f61782ae..cbbb4315 100644
---- a/buildtools/custommakefiles/customprojectpart.cpp
-+++ b/buildtools/custommakefiles/customprojectpart.cpp
-@@ -62,11 +62,11 @@
- #include <kdevplugininfo.h>
-
- typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory;
--static const KDevPluginInfo data( "kdevcustomproject" );
--K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) )
-+static const KDevPluginInfo pluginData( "kdevcustomproject" );
-+K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( pluginData ) )
-
- CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & )
-- : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
-+ : KDevBuildTool( &pluginData, parent, name ? name : "CustomProjectPart" )
- , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false )
- {
- setInstance( CustomProjectFactory::instance() );
-diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
-index 98127f0a..d4670adb 100644
---- a/buildtools/pascal/pascalproject_part.cpp
-+++ b/buildtools/pascal/pascalproject_part.cpp
-@@ -49,11 +49,11 @@
- #include <kdevplugininfo.h>
-
- typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory;
--static const KDevPluginInfo data("kdevpascalproject");
--K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevpascalproject");
-+K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( pluginData ) )
-
- PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& )
-- :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
-+ :KDevBuildTool(&pluginData, parent, name ? name : "PascalProjectPart" )
- {
- setInstance(PascalProjectFactory::instance());
- setXMLFile("kdevpascalproject.rc");
-diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
-index fe16d538..82bb7416 100644
---- a/buildtools/qmake/trollprojectpart.cpp
-+++ b/buildtools/qmake/trollprojectpart.cpp
-@@ -57,11 +57,11 @@
- #include <urlutil.h>
-
- typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory;
--static const KDevPluginInfo data("kdevtrollproject");
--K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevtrollproject");
-+K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) )
-
- TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args )
-- : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
-+ : KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart")
- {
- setInstance(TrollProjectFactory::instance());
-
-diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
-index 8f6b5fb4..42ce8935 100644
---- a/buildtools/script/scriptprojectpart.cpp
-+++ b/buildtools/script/scriptprojectpart.cpp
-@@ -37,11 +37,11 @@
- #include "kdevplugininfo.h"
-
- typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory;
--static const KDevPluginInfo data("kdevscriptproject");
--K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevscriptproject");
-+K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( pluginData ) )
-
- ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart")
-+ : KDevBuildTool(&pluginData, parent, name ? name : "ScriptProjectPart")
- {
- setInstance(ScriptProjectFactory::instance());
-
-diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp
-index a9a4339a..c700823d 100644
---- a/editors/editor-chooser/editorchooser_part.cpp
-+++ b/editors/editor-chooser/editorchooser_part.cpp
-@@ -13,11 +13,11 @@
- #include "editorchooser_widget.h"
-
- typedef KDevGenericFactory<EditorChooserPart> EditorChooserFactory;
--static const KDevPluginInfo data("kdeveditorchooser");
--K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) )
-+static const KDevPluginInfo pluginData("kdeveditorchooser");
-+K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( pluginData ) )
-
- EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "EditorChooserPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "EditorChooserPart")
- {
- setInstance(EditorChooserFactory::instance());
-
-diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
-index 6abe66c5..effee085 100644
---- a/embedded/visualboyadvance/visualboyadvance_part.cpp
-+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
-@@ -20,11 +20,11 @@
- using namespace VisualBoyAdvance;
-
- typedef KDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory;
--static const KDevPluginInfo data("kdevvisualboyadvance");
--K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevvisualboyadvance");
-+K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( pluginData ) )
-
- VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name){
-+ : KDevPlugin(&pluginData, parent, name){
- setInstance(VisualBoyAdvanceFactory::instance());
-
- setXMLFile("kdevpart_visualboyadvance.rc");
-diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
-index 0d87f0a7..1ca3abfd 100644
---- a/languages/ada/adasupportpart.cpp
-+++ b/languages/ada/adasupportpart.cpp
-@@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 };
-
- typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory;
-
--static const KDevPluginInfo data("kdevadasupport");
--K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data))
-+static const KDevPluginInfo pluginData("kdevadasupport");
-+K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (pluginData))
-
-
- struct AdaSupportPartData {
-@@ -51,7 +51,7 @@ struct AdaSupportPartData {
- };
-
- AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
-+ : KDevLanguageSupport (&pluginData, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
- {
- setInstance (AdaSupportPartFactory::instance ());
-
-diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
-index 7e30b913..ca289234 100644
---- a/languages/bash/bashsupport_part.cpp
-+++ b/languages/bash/bashsupport_part.cpp
-@@ -33,11 +33,11 @@
- #include <codemodel.h>
-
- typedef KDevGenericFactory<BashSupportPart> BashSupportFactory;
--static const KDevPluginInfo data("kdevbashsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevbashsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( pluginData ) )
-
- BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& )
--: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
-+: KDevLanguageSupport (&pluginData, parent, name ? name : "BashSupportPart" )
- {
- setInstance(BashSupportFactory::instance());
- setXMLFile("kdevbashsupport.rc");
-diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
-index aa950c8a..6a2559ba 100644
---- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
-+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
-@@ -22,14 +22,14 @@
- #include "%{APPNAMELC}projectconfig.h"
-
- typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
--KDevPluginInfo data("kdev%{APPNAMELC}");
--K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
-+KDevPluginInfo pluginData("kdev%{APPNAMELC}");
-+K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) );
-
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
- %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-- : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
-+ : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part")
- {
- setInstance(%{APPNAME}Factory::instance());
- setXMLFile("kdev%{APPNAMELC}.rc");
-diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
-index aa950c8a..6a2559ba 100644
---- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
-+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
-@@ -22,14 +22,14 @@
- #include "%{APPNAMELC}projectconfig.h"
-
- typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
--KDevPluginInfo data("kdev%{APPNAMELC}");
--K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
-+KDevPluginInfo pluginData("kdev%{APPNAMELC}");
-+K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) );
-
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
- %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-- : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
-+ : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part")
- {
- setInstance(%{APPNAME}Factory::instance());
- setXMLFile("kdev%{APPNAMELC}.rc");
-diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp
-index 5d11ab04..cf5ff24a 100644
---- a/languages/cpp/cppsupportfactory.cpp
-+++ b/languages/cpp/cppsupportfactory.cpp
-@@ -16,10 +16,10 @@
-
- K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory )
-
--static const KDevPluginInfo data("kdevcppsupport");
-+static const KDevPluginInfo pluginData("kdevcppsupport");
-
- CppSupportFactory::CppSupportFactory()
--: KDevGenericFactory<CppSupportPart>( data )
-+: KDevGenericFactory<CppSupportPart>( pluginData )
- {
- }
-
-@@ -35,5 +35,5 @@ TDEInstance *CppSupportFactory::createInstance()
-
- const KDevPluginInfo * CppSupportFactory::info()
- {
-- return &data;
-+ return &pluginData;
- }
-diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
-index 6da33030..8ecb44eb 100644
---- a/languages/csharp/csharpsupportpart.cpp
-+++ b/languages/csharp/csharpsupportpart.cpp
-@@ -45,11 +45,11 @@
- //#include "programmingbycontract.h"
-
- typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
--static const KDevPluginInfo data("kdevcsharpsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevcsharpsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( pluginData ) )
-
- CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "CSharpSupportPart")
- {
- setInstance(CSharpSupportFactory::instance());
-
-diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
-index 4f749ed3..170ff230 100644
---- a/languages/fortran/fortransupportpart.cpp
-+++ b/languages/fortran/fortransupportpart.cpp
-@@ -45,11 +45,11 @@
-
-
- typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory;
--static const KDevPluginInfo data("kdevfortransupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfortransupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( pluginData ) )
-
- FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "FortranSupportPart")
- {
- setInstance(FortranSupportFactory::instance());
-
-diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
-index 94e435f2..299e283f 100644
---- a/languages/java/javasupportfactory.cpp
-+++ b/languages/java/javasupportfactory.cpp
-@@ -14,11 +14,11 @@
- #include <kdevplugininfo.h>
- #include "javasupportfactory.h"
-
--static const KDevPluginInfo data("kdevjavasupport");
-+static const KDevPluginInfo pluginData("kdevjavasupport");
- K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory )
-
- JavaSupportFactory::JavaSupportFactory()
-- : KDevGenericFactory<JavaSupportPart>( data )
-+ : KDevGenericFactory<JavaSupportPart>( pluginData )
- {
- }
-
-@@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance()
-
- const KDevPluginInfo *JavaSupportFactory::info()
- {
-- return &data;
-+ return &pluginData;
- }
-
-diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
-index 5a00e9c6..71c680b4 100644
---- a/languages/kjssupport/kjssupport_part.cpp
-+++ b/languages/kjssupport/kjssupport_part.cpp
-@@ -50,8 +50,8 @@
- #include "subclassingdlg.h"
-
- typedef KDevGenericFactory<kjsSupportPart> kjsSupportFactory;
--static const KDevPluginInfo data("kdevkjssupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) );
-+static const KDevPluginInfo pluginData("kdevkjssupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( pluginData ) );
-
-
- class typeProperty
-@@ -63,7 +63,7 @@ class typeProperty
- };
-
- kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& )
--: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" )
-+: KDevLanguageSupport(&pluginData, parent, name ? name : "kjsSupportPart" )
- {
- setInstance(kjsSupportFactory::instance());
- setXMLFile("kdevkjssupport.rc");
-diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
-index a61ab6a0..90532c22 100644
---- a/languages/pascal/pascalsupport_part.cpp
-+++ b/languages/pascal/pascalsupport_part.cpp
-@@ -44,11 +44,11 @@ struct PascalSupportPartData{
- };
-
- typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory;
--static const KDevPluginInfo data("kdevpascalsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevpascalsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( pluginData ) )
-
- PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "KDevPascalSupport" ),
- d( new PascalSupportPartData() )
- {
- setInstance(PascalSupportFactory::instance());
-diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
-index 3236e72e..1bcbb96b 100644
---- a/languages/perl/perlsupportpart.cpp
-+++ b/languages/perl/perlsupportpart.cpp
-@@ -45,11 +45,11 @@
- //#include "programmingbycontract.h"
-
- typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory;
--static const KDevPluginInfo data("kdevperlsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevperlsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( pluginData ) )
-
- PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PerlSupportPart")
- {
- setInstance(PerlSupportFactory::instance());
-
-diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
-index c189cc5c..252b2167 100644
---- a/languages/php/phpsupportpart.cpp
-+++ b/languages/php/phpsupportpart.cpp
-@@ -66,11 +66,11 @@
-
- using namespace std;
-
--static const KDevPluginInfo data("kdevphpsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevphpsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( pluginData ) )
-
- PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PHPSupportPart")
- {
- m_htmlView = 0;
- m_parser = 0;
-diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
-index e7529c2f..68baf71e 100644
---- a/languages/python/pythonsupportpart.cpp
-+++ b/languages/python/pythonsupportpart.cpp
-@@ -39,11 +39,11 @@
- #include "pythonimplementationwidget.h"
-
- typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory;
--static const KDevPluginInfo data("kdevpythonsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevpythonsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( pluginData ) )
-
- PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PythonSupportPart")
- {
- setInstance(PythonSupportFactory::instance());
-
-diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
-index e61d7cef..db9576b3 100644
---- a/languages/ruby/rubysupport_part.cpp
-+++ b/languages/ruby/rubysupport_part.cpp
-@@ -38,11 +38,11 @@
- #include <codemodel_utils.h>
-
- typedef KDevGenericFactory<RubySupportPart> RubySupportFactory;
--static const KDevPluginInfo data("kdevrubysupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevrubysupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( pluginData ) )
-
- RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" )
-+ : KDevLanguageSupport (&pluginData, parent, name ? name : "RubySupportPart" )
- {
- setInstance(RubySupportFactory::instance());
- setXMLFile("kdevrubysupport.rc");
-diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
-index e676cee5..96e8ed4f 100644
---- a/languages/sql/sqlsupport_part.cpp
-+++ b/languages/sql/sqlsupport_part.cpp
-@@ -30,11 +30,11 @@
- #include "domutil.h"
-
- typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory;
--static const KDevPluginInfo data("kdevsqlsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevsqlsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( pluginData ) )
-
- SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& )
-- : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" )
-+ : KDevLanguageSupport ( &pluginData, parent, name ? name : "SQLSupportPart" )
- {
- setInstance( SQLSupportFactory::instance() );
- setXMLFile( "kdevsqlsupport.rc" );
-diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h
-index 6f8d3dc9..7bca8db4 100644
---- a/lib/interfaces/kdevgenericfactory.h
-+++ b/lib/interfaces/kdevgenericfactory.h
-@@ -33,7 +33,7 @@ to create factories for TDevelop plugins. For example, for DummyPlugin
- the factory can be created (in dummyplugin.cpp file) as:
- @code
- typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
--K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) )
- @endcode
- Data should be a const static object. This way it complies with the requirements
- for data objecs of KDevGenericFactory constructor.
-@@ -47,12 +47,12 @@ For example, dummyplugin.cpp file could contain:
- @code
- #include <kdevplugininfo.h>
-
--static const KDevPluginInfo data("KDevDummyPlugin");
-+static const KDevPluginInfo pluginData("KDevDummyPlugin");
- typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
--K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) )
-
- DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & )
-- :KDevPlugin(&data, parent, name)
-+ :KDevPlugin(&pluginData, parent, name)
- {
- }
- @endcode
-diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
-index f5b5e2e7..6f9198b0 100644
---- a/parts/astyle/astyle_part.cpp
-+++ b/parts/astyle/astyle_part.cpp
-@@ -33,7 +33,7 @@
- #include "astyle_widget.h"
- #include "astyle_adaptor.h"
-
--static const KDevPluginInfo data("kdevastyle");
-+static const KDevPluginInfo pluginData("kdevastyle");
-
- namespace {
- const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm";
-@@ -41,10 +41,10 @@ namespace {
-
-
- typedef KDevGenericFactory<AStylePart> AStyleFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( pluginData ) )
-
- AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevSourceFormatter(&data, parent, name ? name : "AStylePart")
-+ : KDevSourceFormatter(&pluginData, parent, name ? name : "AStylePart")
- {
- setInstance(AStyleFactory::instance());
-
-diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
-index 2d5a0a10..04fee8d7 100644
---- a/parts/bookmarks/bookmarks_part.cpp
-+++ b/parts/bookmarks/bookmarks_part.cpp
-@@ -41,11 +41,11 @@
- #define BOOKMARKSETTINGSPAGE 1
-
- typedef KDevGenericFactory<BookmarksPart> BookmarksFactory;
--static const KDevPluginInfo data("kdevbookmarks");
--K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevbookmarks");
-+K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( pluginData ) )
-
- BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin(&data, parent, name ? name : "BookmarksPart" )
-+ : KDevPlugin(&pluginData, parent, name ? name : "BookmarksPart" )
- {
- setInstance(BookmarksFactory::instance());
-
-diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
-index 92e26bd0..d068adaa 100644
---- a/parts/classview/classviewpart.cpp
-+++ b/parts/classview/classviewpart.cpp
-@@ -139,12 +139,12 @@ class FunctionCompletion : public CustomCompleter {
-
-
- typedef KDevGenericFactory<ClassViewPart> ClassViewFactory;
--static const KDevPluginInfo data("kdevclassview");
--K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevclassview");
-+K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( pluginData ) )
-
- ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& )
-- :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
-- KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
-+ :/// KDevPlugin( &pluginData, parent, name ? name : "ClassViewPart" ),
-+ KDevCodeBrowserFrontend( &pluginData, parent, name ? name : "ClassViewPart" ),
- m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0)
- {
- setInstance(ClassViewFactory::instance());
-diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
-index 92dd4dc7..1333ac54 100644
---- a/parts/ctags2/ctags2_part.cpp
-+++ b/parts/ctags2/ctags2_part.cpp
-@@ -55,11 +55,11 @@ namespace ctags
- }
-
- typedef KDevGenericFactory<CTags2Part> CTags2Factory;
--static const KDevPluginInfo data("kdevctags2");
--K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) )
-+static const KDevPluginInfo pluginData("kdevctags2");
-+K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( pluginData ) )
-
- CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin(&data, parent, name ? name : "ctags2Part" )
-+ : KDevPlugin(&pluginData, parent, name ? name : "ctags2Part" )
- {
- setInstance(CTags2Factory::instance());
- setXMLFile("kdevpart_ctags2.rc");
-diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
-index 01c703d0..eb2063c4 100644
---- a/parts/diff/diffpart.cpp
-+++ b/parts/diff/diffpart.cpp
-@@ -36,13 +36,13 @@
- #include "diffdlg.h"
- #include "diffwidget.h"
-
--static const KDevPluginInfo data("kdevdiff");
-+static const KDevPluginInfo pluginData("kdevdiff");
-
- typedef KDevGenericFactory<DiffPart> DiffFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( pluginData ) )
-
- DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
-+ : KDevDiffFrontend(&pluginData, parent, name ? name : "DiffPart"), proc(0)
- {
- setInstance(DiffFactory::instance());
- setXMLFile("kdevdiff.rc");
-diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp
-index e8a3e11a..fd235a0a 100644
---- a/parts/distpart/distpart_part.cpp
-+++ b/parts/distpart/distpart_part.cpp
-@@ -34,11 +34,11 @@
- #include <kdialogbase.h>
-
- typedef KDevGenericFactory<DistpartPart> DistpartFactory;
--static const KDevPluginInfo data("kdevdistpart");
--K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevdistpart");
-+K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( pluginData ) )
-
- DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "DistpartPart") {
-+ : KDevPlugin(&pluginData, parent, name ? name : "DistpartPart") {
-
- kdDebug(9007) << "DistpartPart::DistpartPart()" << endl;
- setInstance(DistpartFactory::instance());
-diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
-index 3b9e9b78..1d284a64 100644
---- a/parts/documentation/documentation_part.cpp
-+++ b/parts/documentation/documentation_part.cpp
-@@ -72,13 +72,13 @@
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
--static const KDevPluginInfo data("kdevdocumentation");
-+static const KDevPluginInfo pluginData("kdevdocumentation");
-
- typedef KDevGenericFactory<DocumentationPart> DocumentationFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( pluginData ) )
-
- DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& )
-- :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
-+ :KDevPlugin(&pluginData, parent, name ? name : "DocumentationPart" ),
- m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false)
- {
- setInstance(DocumentationFactory::instance());
-diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
-index d965d98b..36d41e8d 100644
---- a/parts/doxygen/doxygenpart.cpp
-+++ b/parts/doxygen/doxygenpart.cpp
-@@ -48,11 +48,11 @@
- #define PROJECTOPTIONS 1
-
- typedef KDevGenericFactory<DoxygenPart> DoxygenFactory;
--static const KDevPluginInfo data("kdevdoxygen");
--K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevdoxygen");
-+K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( pluginData ) )
-
- DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
-+ : KDevPlugin(&pluginData, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
- {
- setInstance(DoxygenFactory::instance());
- setXMLFile("kdevdoxygen.rc");
-diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
-index 1c371177..a1529097 100644
---- a/parts/filecreate/filecreate_part.cpp
-+++ b/parts/filecreate/filecreate_part.cpp
-@@ -54,16 +54,16 @@
-
- #include "config.h"
-
--static const KDevPluginInfo data("kdevfilecreate");
-+static const KDevPluginInfo pluginData("kdevfilecreate");
-
- typedef KDevGenericFactory<FileCreatePart> FileCreateFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( pluginData ) )
-
- using namespace FileCreate;
-
- FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & )
--// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-- : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
-+// : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-+ : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_subPopups(0)
- {
- setInstance(FileCreateFactory::instance());
- setXMLFile("kdevpart_filecreate.rc");
-diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
-index b5f9961a..de9b5fef 100644
---- a/parts/fileselector/fileselector_part.cpp
-+++ b/parts/fileselector/fileselector_part.cpp
-@@ -31,11 +31,11 @@
- #include "fileselector_widget.h"
-
- typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory;
--static const KDevPluginInfo data("kdevfileselector");
--K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfileselector");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( pluginData ) )
-
- FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "FileSelectorPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "FileSelectorPart")
- {
- setInstance(FileSelectorFactory::instance());
-
-diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
-index 77fc9646..91b1a0bc 100644
---- a/parts/fileview/filegroupspart.cpp
-+++ b/parts/fileview/filegroupspart.cpp
-@@ -33,11 +33,11 @@
- #define FILEGROUPS_OPTIONS 1
-
- typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory;
--static const KDevPluginInfo data("kdevfilegroups");
--K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfilegroups");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( pluginData ) )
-
- FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "FileGroupsPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "FileGroupsPart")
- {
- deleteRequested = false;
- setInstance(FileGroupsFactory::instance());
-diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
-index 414cea52..25aa8f62 100644
---- a/parts/fileview/fileviewpart.cpp
-+++ b/parts/fileview/fileviewpart.cpp
-@@ -50,15 +50,15 @@ VCSColors FileViewPart::vcsColors;
- ///////////////////////////////////////////////////////////////////////////////
-
- typedef KDevGenericFactory<FileViewPart> FileViewFactory;
--static const KDevPluginInfo data("kdevfileview");
--K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfileview");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( pluginData ) )
-
- ///////////////////////////////////////////////////////////////////////////////
- // class FileTreeWidget
- ///////////////////////////////////////////////////////////////////////////////
-
- FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "FileViewPart"),
-+ : KDevPlugin(&pluginData, parent, name ? name : "FileViewPart"),
- m_widget( 0 )
- {
- setInstance( FileViewFactory::instance() );
-diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
-index 5ebd265e..3a1351ad 100644
---- a/parts/filter/filterpart.cpp
-+++ b/parts/filter/filterpart.cpp
-@@ -26,11 +26,11 @@
- #include "shellinsertdlg.h"
- #include "kdevfilterIface.h"
-
--static const KDevPluginInfo data("kdevfilter");
--K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfilter");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( pluginData ) )
-
- FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "FilterPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "FilterPart")
- {
- setInstance(FilterFactory::instance());
- setXMLFile("kdevfilter.rc");
-diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
-index 0bdc714f..98581a9c 100644
---- a/parts/fullscreen/fullscreen_part.cpp
-+++ b/parts/fullscreen/fullscreen_part.cpp
-@@ -22,13 +22,13 @@
-
- #include "fullscreen_part.h"
-
--static const KDevPluginInfo data("kdevfullscreen");
-+static const KDevPluginInfo pluginData("kdevfullscreen");
-
- typedef KDevGenericFactory<FullScreenPart> FullScreenFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( pluginData ) )
-
- FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin(&data, parent, name ? name : "FullScreenPart" )
-+ : KDevPlugin(&pluginData, parent, name ? name : "FullScreenPart" )
- {
- setInstance(FullScreenFactory::instance());
- // const TDEAboutData &abdata1 = *(info());
-diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
-index 3a0e0e7d..3d8b47bf 100644
---- a/parts/outputviews/appoutputviewpart.cpp
-+++ b/parts/outputviews/appoutputviewpart.cpp
-@@ -29,12 +29,12 @@
- #include "kdevpartcontroller.h"
- #include "settings.h"
-
--static const KDevPluginInfo data("kdevappoutputview");
-+static const KDevPluginInfo pluginData("kdevappoutputview");
- typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( pluginData ) )
-
- AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
-+ : KDevAppFrontend(&pluginData, parent, name ? name : "AppOutputViewPart")
- {
- setInstance(AppViewFactory::instance());
-
-diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
-index 8b441e94..2df7d384 100644
---- a/parts/outputviews/makeviewpart.cpp
-+++ b/parts/outputviews/makeviewpart.cpp
-@@ -26,12 +26,12 @@
-
- #include "makewidget.h"
-
--static const KDevPluginInfo data("kdevmakeview");
-+static const KDevPluginInfo pluginData("kdevmakeview");
- typedef KDevGenericFactory< MakeViewPart > MakeViewFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( pluginData ) )
-
- MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevMakeFrontend(&data, parent, name)
-+ : KDevMakeFrontend(&pluginData, parent, name)
- {
- setInstance(MakeViewFactory::instance());
-
-diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
-index d5240edb..57b1cd58 100644
---- a/parts/partexplorer/partexplorer_plugin.cpp
-+++ b/parts/partexplorer/partexplorer_plugin.cpp
-@@ -23,13 +23,13 @@
-
- #include "partexplorerform.h"
-
--static const KDevPluginInfo data("kdevpartexplorer");
-+static const KDevPluginInfo pluginData("kdevpartexplorer");
-
- typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( pluginData ) )
-
- PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & )
-- : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
-+ : KDevPlugin( &pluginData, parent, name ? name : "PartExplorerPlugin" )
- {
- // we need an instance
- setInstance( PartExplorerPluginFactory::instance() );
-diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
-index 4d316e68..78c97eb6 100644
---- a/parts/quickopen/quickopen_part.cpp
-+++ b/parts/quickopen/quickopen_part.cpp
-@@ -44,13 +44,13 @@
- #include "kdeveditorutil.h"
-
- typedef KDevGenericFactory<QuickOpenPart> QuickOpenFactory;
--static const KDevPluginInfo data("kdevquickopen");
--K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevquickopen");
-+K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( pluginData ) )
-
- using namespace KTextEditor;
-
- QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" )
-+ : KDevQuickOpen(&pluginData, parent, name ? name : "QuickOpenPart" )
- {
- setInstance(QuickOpenFactory::instance());
- setXMLFile("kdevpart_quickopen.rc");
-diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
-index 6c45a492..1e16d144 100644
---- a/parts/regexptest/regexptestpart.cpp
-+++ b/parts/regexptest/regexptestpart.cpp
-@@ -19,13 +19,13 @@
- #include "kdevcore.h"
- #include "regexptestdlg.h"
-
--static const KDevPluginInfo data("kdevregexptest");
-+static const KDevPluginInfo pluginData("kdevregexptest");
-
- typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( pluginData ) )
-
- RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "RegexpTestPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "RegexpTestPart")
- {
- setInstance(RegexpTestFactory::instance());
- setXMLFile("kdevregexptest.rc");
-diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
-index 80a33c9e..d0558b79 100644
---- a/parts/scripting/scriptingpart.cpp
-+++ b/parts/scripting/scriptingpart.cpp
-@@ -41,14 +41,14 @@
- #include "tdescriptactionmanager.h"
-
- typedef KDevGenericFactory<scriptingPart> scriptingFactory;
--KDevPluginInfo data("kdevscripting");
--K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) )
-+KDevPluginInfo pluginData("kdevscripting");
-+K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( pluginData ) )
-
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
- scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-- : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
-+ : KDevPlugin(&pluginData, parent, name ? name : "scriptingPart"), m_scripts(0L)
- {
- setInstance(scriptingFactory::instance());
- setXMLFile("kdevscripting.rc");
-diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
-index 82969151..1c650ce2 100644
---- a/parts/snippet/snippet_part.cpp
-+++ b/parts/snippet/snippet_part.cpp
-@@ -33,12 +33,12 @@
- #include "snippetsettings.h"
- #include "snippetconfig.h"
-
--static const KDevPluginInfo data("kdevsnippet");
-+static const KDevPluginInfo pluginData("kdevsnippet");
- typedef KDevGenericFactory<SnippetPart> snippetFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( pluginData ) )
-
- SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin(&data, parent, name ? name : "SnippetPart" )
-+ : KDevPlugin(&pluginData, parent, name ? name : "SnippetPart" )
- {
- setInstance(snippetFactory::instance());
- setXMLFile("kdevpart_snippet.rc");
-diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
-index 4453030a..7e38f061 100644
---- a/parts/texttools/texttoolspart.cpp
-+++ b/parts/texttools/texttoolspart.cpp
-@@ -25,11 +25,11 @@
-
-
- typedef KDevGenericFactory<TextToolsPart> TextToolsFactory;
--static const KDevPluginInfo data("kdevtexttools");
--K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevtexttools");
-+K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( pluginData ) )
-
- TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "TextToolsPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "TextToolsPart")
- {
- setInstance(TextToolsFactory::instance());
- // setXMLFile("kdevfileview.rc");
-diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
-index 6cd63deb..9172d44b 100644
---- a/parts/tipofday/tipofday_part.cpp
-+++ b/parts/tipofday/tipofday_part.cpp
-@@ -19,13 +19,13 @@
- #include "kdevapi.h"
- #include "kdevcore.h"
-
--static const KDevPluginInfo data("kdevtipofday");
-+static const KDevPluginInfo pluginData("kdevtipofday");
-
- typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( pluginData ) )
-
- TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "TipOfDayPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "TipOfDayPart")
- {
- setInstance(TipOfDayFactory::instance());
-
-diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
-index 8734eadc..61f962ad 100644
---- a/parts/tools/tools_part.cpp
-+++ b/parts/tools/tools_part.cpp
-@@ -34,13 +34,13 @@
- #define TOOLSSETTINGS 1
- #define EXTRATOOLSSETTINGS 2
-
--static const KDevPluginInfo data("kdevtools");
--K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevtools");
-+K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( pluginData ) )
-
- TQMap<int, TQString> externalToolMenuEntries;
-
- ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin( &data, parent, name ? name : "ToolsPart")
-+ : KDevPlugin( &pluginData, parent, name ? name : "ToolsPart")
- {
- setInstance(ToolsFactory::instance());
-
-diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
-index fdc9fa6a..a547bdef 100644
---- a/parts/uimode/uichooser_part.cpp
-+++ b/parts/uimode/uichooser_part.cpp
-@@ -15,11 +15,11 @@
- #define UICHOOSERSETTINGSPAGE 1
-
- typedef KDevGenericFactory<UIChooserPart> UIChooserFactory;
--static const KDevPluginInfo data("kdevuichooser");
--K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevuichooser");
-+K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( pluginData ) )
-
- UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin( &data, parent, name ? name : "UIChooserPart")
-+ : KDevPlugin( &pluginData, parent, name ? name : "UIChooserPart")
- {
- setInstance(UIChooserFactory::instance());
-
-diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
-index 1b262175..5c78d952 100644
---- a/parts/valgrind/valgrind_part.cpp
-+++ b/parts/valgrind/valgrind_part.cpp
-@@ -23,11 +23,11 @@
- #include "valgrinditem.h"
-
- typedef KDevGenericFactory<ValgrindPart> ValgrindFactory;
--static const KDevPluginInfo data("kdevvalgrind");
--K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevvalgrind");
-+K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( pluginData ) )
-
- ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin( &data, parent, name ? name : "ValgrindPart" )
-+ : KDevPlugin( &pluginData, parent, name ? name : "ValgrindPart" )
- {
- setInstance( ValgrindFactory::instance() );
- setXMLFile( "kdevpart_valgrind.rc" );
-diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
-index ec176c47..e8606636 100644
---- a/parts/vcsmanager/vcsmanagerpart.cpp
-+++ b/parts/vcsmanager/vcsmanagerpart.cpp
-@@ -42,14 +42,14 @@
- #include "vcsmanagerprojectconfig.h"
-
- typedef KDevGenericFactory<VCSManagerPart> VCSManagerFactory;
--KDevPluginInfo data("kdevvcsmanager");
--K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) )
-+KDevPluginInfo pluginData("kdevvcsmanager");
-+K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( pluginData ) )
-
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
- VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-- : KDevPlugin(&data, parent, name ? name : "VCSManagerPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "VCSManagerPart")
- {
- kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl;
-
-diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
-index aeb1eea9..8f05fbad 100644
---- a/vcs/clearcase/clearcasepart.cpp
-+++ b/vcs/clearcase/clearcasepart.cpp
-@@ -37,13 +37,13 @@
- #include "clearcasemanipulator.h"
-
-
--static const KDevPluginInfo data("kdevclearcase");
-+static const KDevPluginInfo pluginData("kdevclearcase");
-
- typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( pluginData ) )
-
- ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & )
-- : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
-+ : KDevVersionControl( &pluginData, parent, name ? name : "ClearcasePart" ),
- default_checkin(""),
- default_checkout(""),
- default_uncheckout("-rm"),
-diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
-index 2bda55f1..6ded6ecb 100644
---- a/vcs/cvsservice/cvspart.cpp
-+++ b/vcs/cvsservice/cvspart.cpp
-@@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false;
- // Plugin factory
- ///////////////////////////////////////////////////////////////////////////////
-
--static const KDevPluginInfo data("kdevcvsservice");
-+static const KDevPluginInfo pluginData("kdevcvsservice");
- typedef KDevGenericFactory<CvsServicePart> CvsFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( pluginData ) )
-
- ///////////////////////////////////////////////////////////////////////////////
- // class CvsServicePart
- ///////////////////////////////////////////////////////////////////////////////
-
- CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & )
-- : KDevVersionControl( &data, parent,
-+ : KDevVersionControl( &pluginData, parent,
- name ? name : "CvsService" ),
- actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ),
- actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ),
-diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
-index f92666b6..76a4456a 100644
---- a/vcs/perforce/perforcepart.cpp
-+++ b/vcs/perforce/perforcepart.cpp
-@@ -33,13 +33,13 @@
- #include "commitdlg.h"
- #include "execcommand.h"
-
--static const KDevPluginInfo data("kdevperforce");
-+static const KDevPluginInfo pluginData("kdevperforce");
-
- typedef KDevGenericFactory<PerforcePart> PerforceFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( pluginData ) )
-
- PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
-- : KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
-+ : KDevVersionControl( &pluginData, parent, name ? name : "PerforcePart" )
- {
- setInstance(PerforceFactory::instance());
- setupActions();
-diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
-index f3f43cd9..98b44848 100644
---- a/vcs/subversion/subversion_part.cpp
-+++ b/vcs/subversion/subversion_part.cpp
-@@ -56,15 +56,15 @@
-
- using namespace SvnGlobal;
-
--static const KDevPluginInfo data("kdevsubversion");
-+static const KDevPluginInfo pluginData("kdevsubversion");
-
- typedef KDevGenericFactory<subversionPart> subversionFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( pluginData ) )
-
- //bool g_projectWasJustCreated = false;
-
- subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevVersionControl(&data, parent, name ? name : "Subversion" ) {
-+ : KDevVersionControl(&pluginData, parent, name ? name : "Subversion" ) {
- setInstance(subversionFactory::instance());
- m_projWidget = 0;
-
---
-cgit v1.2.1
-
diff --git a/arch/tde-devel/tde-tdewebdev/PKGBUILD b/arch/tde-devel/tde-tdewebdev/PKGBUILD
index 0b2221cde..7373b661e 100644
--- a/arch/tde-devel/tde-tdewebdev/PKGBUILD
+++ b/arch/tde-devel/tde-tdewebdev/PKGBUILD
@@ -1,43 +1,47 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdewebdev
-pkgver=14.0.10
+_mod=tdewebdev
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdewebdev'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-devel')
pkgdesc="Trinity Web Developer Tools"
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdewebdev')
-conflicts=('trinity-tdewebdev' 'trinity-kdewebdev')
-replaces=('trinity-tdewebdev')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdewebdev-trinity-${pkgver}.tar.xz")
-md5sums=('96bcdfdcd4308b0721ed23d7d5b9954f')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('e345b611edd878ca09a65d9d9e0739e0')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-abakus/PKGBUILD b/arch/tde-extra/tde-abakus/PKGBUILD
index c8961c7d7..67e4b762e 100644
--- a/arch/tde-extra/tde-abakus/PKGBUILD
+++ b/arch/tde-extra/tde-abakus/PKGBUILD
@@ -2,10 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=abakus
-_cat=applications/
+_cat=applications/utilities/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
pkgrel=1
pkgdesc="Calculator for TDE"
arch=('i686' 'x86_64')
@@ -17,17 +18,16 @@ depends=(
'tde-tdelibs'
)
makedepends=(
- 'cmake'
- 'pkgconfig'
+ 'tde-cmake-trinity'
)
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('90fa9e728b8b48ad5e51c95eb5d05dc7')
+md5sums=('5f8e3779d9d4f7ddad3c436cb5bbfd03')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -39,6 +39,7 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -46,11 +47,11 @@ build() {
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-akode/PKGBUILD b/arch/tde-extra/tde-akode/PKGBUILD
new file mode 100644
index 000000000..062c1e1a1
--- /dev/null
+++ b/arch/tde-extra/tde-akode/PKGBUILD
@@ -0,0 +1,54 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=akode
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="akode plugin for aRts"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('alsa-plugins'
+ 'alsa-tools'
+ 'alsa-utils'
+ 'audiofile'
+ 'libmad'
+ 'libogg'
+ 'libvorbis'
+ 'pulseaudio-alsa')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("kdemod3-${_mod}" "${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('64f003d3a2098535d07a6dc9a210f148')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+ cd $srcdir
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p build
+ cd build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_JACK_SINK=OFF
+
+ msg "Building $pkgname..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-akode/tde-akode.install b/arch/tde-extra/tde-akode/tde-akode.install
new file mode 100644
index 000000000..30e6e407f
--- /dev/null
+++ b/arch/tde-extra/tde-akode/tde-akode.install
@@ -0,0 +1,11 @@
+post_install() {
+ ldconfig &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD
index b87b39775..7068c8547 100644
--- a/arch/tde-extra/tde-amarok/PKGBUILD
+++ b/arch/tde-extra/tde-amarok/PKGBUILD
@@ -1,47 +1,60 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-amarok
-pkgver=14.0.10
+_mod=amarok
+_cat=applications/multimedia/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDE Amarok"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/amarok'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase' 'taglib' 'xine-lib')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tde-amarok')
-#conflicts=('tde-amarok')
-#replaces=('tde-amarok')
+makedepends=('tde-cmake-trinity' 'tde-akode' 'ruby' 'libmtp' 'libvisual' 'sdl')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/amarok-trinity-${pkgver}.tar.xz")
-md5sums=('fab4ed783d4027711e4aaca098bb04b1')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4542cc22dc8104f46e6dd1640ea54cb7')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_YAUAP=OFF \
+ -DWITH_NJB=OFF \
+ -DWITH_IFP=OFF \
+ -DWITH_IPOD=OFF \
+ -DWITH_MP4V2=OFF \
-DWITH_EMBEDDED_SQLITE=ON \
- -DWITH_OPENGL=ON
+ -DWITH_SYSTEM_SQLITE=OFF \
+ -DWITH_MYSQL=OFF \
+ -DWITH_POSTGRESQL=OFF \
+ -DWITH_AMAZON=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-basket/PKGBUILD b/arch/tde-extra/tde-basket/PKGBUILD
index 3e9a7a007..b36019020 100644
--- a/arch/tde-extra/tde-basket/PKGBUILD
+++ b/arch/tde-extra/tde-basket/PKGBUILD
@@ -2,10 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=basket
-_cat=applications/
+_cat=applications/office/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
pkgrel=1
pkgdesc="A multi-purpose note-taking application for KDE"
arch=('i686' 'x86_64')
@@ -17,22 +18,28 @@ depends=(
'tde-tdelibs'
)
makedepends=(
- 'cmake'
- 'pkgconfig'
+ 'tde-cmake-trinity'
'tde-tdepim'
)
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('6a70768661d810eeeba5281075215803')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
+ 'bp000-fix-crash-on-export-basket-archive.diff')
+md5sums=('1b078e8c8d67c2ce110080fa687bd5cb'
+ '402c273bb65646cf377ff9d1be762f07')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+prepare() {
+ cd ${srcdir}/${_mod}-trinity-${pkgver}
+ patch -p1 <${srcdir}/bp000-fix-crash-on-export-basket-archive.diff
+}
+
build() {
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p "$srcdir/build"
@@ -42,6 +49,7 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -49,11 +57,11 @@ build() {
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff b/arch/tde-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff
new file mode 100644
index 000000000..172333cf3
--- /dev/null
+++ b/arch/tde-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff
@@ -0,0 +1,60 @@
+commit 6ccb5528ecff0cf0db5fe2f81b26a79959e87902
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date: Fri Oct 29 03:47:53 2021 +0200
+
+ Prevent null pointer deference in methods for selection.
+ This resolves the crash when exporting the Basket archive.
+
+ Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+ (cherry picked from commit a08c6ac9e3c8ac162ce08b730fd6108e2f71213c)
+
+diff --git a/src/archive.cpp b/src/archive.cpp
+index 3f3377c..aec789f 100644
+--- a/src/archive.cpp
++++ b/src/archive.cpp
+@@ -228,7 +228,8 @@ void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, TQS
+
+ // Recursively save child baskets:
+ BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket);
+- if (recursive && item->firstChild()) {
++ if (recursive && item && item->firstChild())
++ {
+ for (BasketListViewItem *child = (BasketListViewItem*) item->firstChild(); child; child = (BasketListViewItem*) child->nextSibling()) {
+ saveBasketToArchive(child->basket(), recursive, tar, backgrounds, tempFolder, progress);
+ }
+diff --git a/src/basket.cpp b/src/basket.cpp
+index a4edb31..67107d2 100644
+--- a/src/basket.cpp
++++ b/src/basket.cpp
+@@ -4469,12 +4469,20 @@ void Basket::noteUngroup()
+
+ void Basket::unplugSelection(NoteSelection *selection)
+ {
++ if (!selection)
++ {
++ return;
++ }
+ for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked())
+ unplugNote(toUnplug->note);
+ }
+
+ void Basket::insertSelection(NoteSelection *selection, Note *after)
+ {
++ if (!selection)
++ {
++ return;
++ }
+ for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) {
+ if (toUnplug->note->isGroup()) {
+ Note *group = new Note(this);
+@@ -4496,6 +4504,10 @@ void Basket::insertSelection(NoteSelection *selection, Note *after)
+
+ void Basket::selectSelection(NoteSelection *selection)
+ {
++ if (!selection)
++ {
++ return;
++ }
+ for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) {
+ if (toUnplug->note->isGroup())
+ selectSelection(toUnplug);
diff --git a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
index e72405c2f..6a1657746 100644
--- a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
+++ b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
@@ -1,46 +1,50 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-gtk-qt-engine
-pkgver=14.0.10
+_mod=gtk-qt-engine
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="gtk qt engine"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/gtk-qt-engine'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs' 'gtk2')
-makedepends=('pkgconfig' 'cmake')
-#provides=('gtk-qt-engine')
-#conflicts=('gtk-qt-engine')
-#replaces=('gtk-qt-engine')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk-qt-engine-trinity-${pkgver}.tar.xz")
-md5sums=('419342ad15dca93e5e4424eb7b0a2e59')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('60aa938573a877aa4589e49ee312253e')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p "$srcdir/build"
- cd "$srcdir/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
-DWITH_GCC_VISIBILITY=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
index f0f244d99..ad7e7015c 100644
--- a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
+++ b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
@@ -1,25 +1,27 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-gtk3-tqt-engine
-pkgver=14.0.10
+_mod=gtk3-tqt-engine
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="gtk3 tqt engine"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/gtk3-tqt-engine'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs' 'gtk3')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tdemultimedia')
-#conflicts=('gtk3-tqt-engine')
-#replaces=('gtk3-tqt-engine')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk3-tqt-engine-trinity-${pkgver}.tar.xz"
- 'bp000-0e2c727907.diff')
-md5sums=('1f94fd009a3c062e042f914c21d49984'
- '280b56843ebeb41b9ee74120b0ef28b6')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('00a83443141c5c588f41e72ef74ceaf7')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -28,8 +30,6 @@ build() {
## Generate config files and update with autoreconf
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-0e2c727907.diff
-
msg "Copying system libtool files...."
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff b/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff
deleted file mode 100644
index fd8dd3872..000000000
--- a/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit b1327f977ffaa5b1789fd5987f621fa9b35a2a08
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Fri Sep 24 14:54:59 2021 +0200
-
- Fix FTBFS in case TQt3 is not installed in the system directory.
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
- (cherry picked from commit 0e2c72790799d6043225910bd437bd54f5cc6989)
-
-diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am
-index 54a5db3..f1886dc 100644
---- a/tdegtk/Makefile.am
-+++ b/tdegtk/Makefile.am
-@@ -44,9 +44,8 @@ libtdegtk_la_SOURCES = $(source_h) $(source_c)
- libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
-
--libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
--
--libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
-+libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
-+libtdegtk_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
-
- lib_LTLIBRARIES = libtqtcairo.la
-
-@@ -56,5 +55,4 @@ libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
-
- libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_QT) $(LIB_TDEUI)
--
--libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
-+libtqtcairo_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
diff --git a/arch/tde-extra/tde-kmplayer/PKGBUILD b/arch/tde-extra/tde-kmplayer/PKGBUILD
index b7d17b979..70029df30 100644
--- a/arch/tde-extra/tde-kmplayer/PKGBUILD
+++ b/arch/tde-extra/tde-kmplayer/PKGBUILD
@@ -1,48 +1,53 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-kmplayer
-pkgver=14.0.10
+_mod=kmplayer
+_cat=applications/multimedia/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDE KMPlayer"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/kmplayer'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase' 'tde-dbus-tqt' 'dbus-glib')
-makedepends=('pkgconfig' 'cmake' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
-#provides=('kmplayer')
-#conflicts=('kmplayer')
-#replaces=('kmplayer')
+makedepends=('tde-cmake-trinity' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/kmplayer-trinity-${pkgver}.tar.xz")
-md5sums=('e817acc32c3f87cc475be8d8c7a1b4a7')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('bafbf516d47a05cfe2e943f27a93408c')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
-DBUILD_KOFFICE_PLUGIN=OFF \
- -DBUILD_KGSTPLAYER=OFF
+ -DBUILD_KGSTPLAYER=OFF \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-krusader/PKGBUILD b/arch/tde-extra/tde-krusader/PKGBUILD
index 2688b1bec..e53722835 100644
--- a/arch/tde-extra/tde-krusader/PKGBUILD
+++ b/arch/tde-extra/tde-krusader/PKGBUILD
@@ -1,22 +1,26 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-krusader
-pkgver=14.0.10
+_mod=krusader
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDE Krusader"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/krusader'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase')
makedepends=('pkgconfig' 'automake')
-#provides=('krusader')
-#conflicts=('krusader')
-#replaces=('krusader')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/krusader-trinity-${pkgver}.tar.xz")
-md5sums=('1491538ca6e616ec5bdfaa9c9f86c9b2')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2040364b94ba52f8c8c8961b50e7296f')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
diff --git a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
index 4735a9653..55931d492 100644
--- a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
+++ b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
@@ -1,46 +1,50 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-ksplash-engine-moodin
-pkgver=14.0.10
+_mod=ksplash-engine-moodin
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDE KSplash Engine Moodin"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
-#provides=('ksplash-engine-moodin')
-#conflicts=('ksplash-engine-moodin')
-#replaces=('ksplash-engine-moodin')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/ksplash-engine-moodin-trinity-${pkgver}.tar.xz")
-md5sums=('3a10d2089ed4e165ff74994e9efbf262')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('dcb22daf00d9604f284d1315b2870f5e')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-style-qtcurve/PKGBUILD b/arch/tde-extra/tde-style-qtcurve/PKGBUILD
index 47d8524bc..9f3003db6 100644
--- a/arch/tde-extra/tde-style-qtcurve/PKGBUILD
+++ b/arch/tde-extra/tde-style-qtcurve/PKGBUILD
@@ -1,22 +1,26 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-style-qtcurve
-pkgver=14.0.10
+_mod=tde-style-qtcurve
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDE Style QTCurve"
arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/tde-style-qtcurve'
+url="http://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tde-style-qtcurve')
-#conflicts=('tde-style-qtcurve')
-#replaces=('tde-style-qtcurve')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-style-qtcurve-trinity-${pkgver}.tar.xz")
-md5sums=('b5bff2af06e5891d9b4bbeb5b3c83835')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('145c6de3ab7c8910feff4d3b2e2e0dc4')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -27,17 +31,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
-DWITH_GCC_VISIBILITY=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-systemsettings/PKGBUILD b/arch/tde-extra/tde-systemsettings/PKGBUILD
index b92314db6..faaa47b1c 100644
--- a/arch/tde-extra/tde-systemsettings/PKGBUILD
+++ b/arch/tde-extra/tde-systemsettings/PKGBUILD
@@ -1,22 +1,26 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-systemsettings
-pkgver=14.0.10
+_mod=tde-systemsettings
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDE System Settings"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tde-systemsettings'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tde-systemsettings')
-#conflicts=('tde-systemsettings')
-#replaces=('tde-systemsettings')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-systemsettings-trinity-${pkgver}.tar.xz")
-md5sums=('aa7b76706221850c5ef5519360247e7b')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('17d6a2c9a6135680162a10de6ca0f4ae')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -27,17 +31,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
-DBUILD_KNETWORKCONF=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
index f0e578c38..98e554999 100644
--- a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
+++ b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
@@ -1,46 +1,50 @@
# Maintainer: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeaccessibility
-pkgver=14.0.10
+_mod=tdeaccessibility
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="Accessibility utilities for the TDE Desktop"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'tde-tdemultimedia')
+makedepends=('tde-cmake-trinity' 'tde-tdemultimedia')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaccessibility-trinity-${pkgver}.tar.xz")
-md5sums=('0fb53257ee9b5dbd464a6ca8f30ef5b6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('f364bf5a1a460c2278f78b99ded4d646')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdeaddons/PKGBUILD b/arch/tde-extra/tde-tdeaddons/PKGBUILD
index b3acc8363..2fe6f8d5c 100644
--- a/arch/tde-extra/tde-tdeaddons/PKGBUILD
+++ b/arch/tde-extra/tde-tdeaddons/PKGBUILD
@@ -1,46 +1,50 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdeaddons
-pkgver=14.0.10
+_mod=tdeaddons
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdeaddons'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Addons"
depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim')
-provides=('tdeaddons')
-conflicts=('trinity-tdeaddons' 'trinity-kdeaddons')
-replaces=('trinity-tdeaddons')
+makedepends=('tde-cmake-trinity' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim' 'sdl')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaddons-trinity-${pkgver}.tar.xz")
-md5sums=('27557921bf86569042c72d597b87c877')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('70b3c7131761a0c405942614ea8f5243')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_XMMS=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdeedu/PKGBUILD b/arch/tde-extra/tde-tdeedu/PKGBUILD
index 05899c6f3..c5988fc4e 100644
--- a/arch/tde-extra/tde-tdeedu/PKGBUILD
+++ b/arch/tde-extra/tde-tdeedu/PKGBUILD
@@ -1,51 +1,52 @@
# Maintainer: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdeedu
-pkgver=14.0.10
+_mod=tdeedu
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="Educational utilities for the TDE Desktop"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
+makedepends=('tde-cmake-trinity' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeedu-trinity-${pkgver}.tar.xz"
- 'bp000-0cb84fb9.diff')
-md5sums=('3859da24d70f0d787c0cc7f41540772d'
- '5ae3959dc2dc62f1f7421620b198d175')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('10d3f00e8539e7bb74ecb02c6a91c507')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-0cb84fb9.diff
-
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
- #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_OCAML_SOLVER=OFF \
+ -DWITH_LIBUSB=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff b/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff
deleted file mode 100644
index 5dbe6e492..000000000
--- a/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0cb84fb9036ce7bc7c757a3971fdb0c619d0c011 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 09:15:26 +0200
-Subject: Fix FTBFS on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: static assertion failed: comparison object must be invocable as const
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- kiten/learn.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kiten/learn.cpp b/kiten/learn.cpp
-index 94e77b9a..a1b685d4 100644
---- a/kiten/learn.cpp
-+++ b/kiten/learn.cpp
-@@ -762,7 +762,7 @@ void Learn::qupdate()
-
- struct Learn::scoreCompare
- {
-- bool operator()(const TQListViewItem* v1, const TQListViewItem* v2)
-+ bool operator()(const TQListViewItem* v1, const TQListViewItem* v2) const
- {
- return v1->text(4).toInt() < v2->text(4).toInt();
- }
---
-cgit v1.2.1
-
diff --git a/arch/tde-extra/tde-tdegames/PKGBUILD b/arch/tde-extra/tde-tdegames/PKGBUILD
index 887916a87..5c12f1e0a 100644
--- a/arch/tde-extra/tde-tdegames/PKGBUILD
+++ b/arch/tde-extra/tde-tdegames/PKGBUILD
@@ -1,46 +1,49 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdegames
-pkgver=14.0.10
+_mod=tdegames
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdegames'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Games"
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdegames')
-conflicts=('trinity-tdegames' 'trinity-kdegames')
-replaces=('trinity-tdegames')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegames-trinity-${pkgver}.tar.xz")
-md5sums=('870352e848a991f1ff0045ef5590bc47')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ef150b0d95ed82704e6d622da077dd60')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdemultimedia/PKGBUILD b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
index 092c6cd70..89c71dcbd 100644
--- a/arch/tde-extra/tde-tdemultimedia/PKGBUILD
+++ b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
@@ -1,49 +1,52 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdemultimedia
-pkgver=14.0.10
+_mod=tdemultimedia
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="Trinity Desktop MultiMedia Components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdemultimedia'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
-depends=('tde-tdelibs' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdemultimedia')
-conflicts=('trinity-tdemultimedia' 'trinity-kdemultimedia')
-replaces=('trinity-tdemultimedia')
+depends=('tde-tdelibs' 'tde-akode' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdemultimedia-trinity-${pkgver}.tar.xz")
-md5sums=('f1f40920c9eed566eaa98a81b838b7b8')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('dc18c8aa1cdd7f4cbbb6628378ad0e82')
# install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_ALL_OPTIONS=ON \
- -DWITH_ARTS_AKODE=OFF \
-DBUILD_ALL=ON \
- -DBUILD_JUK=OFF
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GSTREAMER=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdenetwork/PKGBUILD b/arch/tde-extra/tde-tdenetwork/PKGBUILD
index 17c098fdb..6d405c578 100644
--- a/arch/tde-extra/tde-tdenetwork/PKGBUILD
+++ b/arch/tde-extra/tde-tdenetwork/PKGBUILD
@@ -1,48 +1,60 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdenetwork
-pkgver=14.0.10
+_mod=tdenetwork
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdenetwork'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Network Components"
-depends=('tde-tdelibs' 'speex' 'wireless_tools' 'wpa_supplicant')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdenetwork')
-conflicts=('trinity-tdenetwork' 'trinity-kdenetwork')
-replaces=('trinity-tdenetwork')
+depends=('tde-tdelibs' 'tde-tqca' 'libgadu' 'wireless_tools' 'wpa_supplicant')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdenetwork-trinity-${pkgver}.tar.xz")
-md5sums=('c3d26523623fbcc65993a044bd83d0f6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('c5ec9a45b636c8da74d71194ed384b81')
# install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
- export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_SPEEX=ON \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_JINGLE=OFF \
+ -DWITH_SPEEX=OFF \
+ -DWITH_XMMS=OFF \
+ -DWITH_SLP=OFF \
+ -DBUILD_KOPETE_PROTOCOL_ALL=ON \
+ -DBUILD_KOPETE_PROTOCOL_SMS=OFF \
+ -DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF \
+ -DBUILD_KOPETE_PLUGIN_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
index ce1489353..f6ca86d33 100644
--- a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
+++ b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
@@ -1,55 +1,48 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdenetworkmanager
-pkgver=14.0.10
+_mod=tdenetworkmanager
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="gtk qt engine"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdenetworkmanager'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tdenetworkmanager')
-#conflicts=('tdenetworkmanager')
-#replaces=('tdenetworkmanager')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=(
- "https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdenetworkmanager-trinity-${pkgver}.tar.xz"
- 'bp000-ea2b20ed7a.diff'
- 'bp001-e4e7853030.diff'
-)
-md5sums=(
- '2edab1bc48066a52f0b53a19457495a2'
- '40f95a5c7c02471e629e109aeca86ce3'
- 'd292626fb10780eb68bbc1a60c1e7ed7'
-)
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('9e36a8f2697081bdb92589ea914980f0')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-ea2b20ed7a.diff
- patch -p1 < ${srcdir}/bp001-e4e7853030.diff
-
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p "${srcdir}/build"
cd "${srcdir}/build"
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
-DWITH_GCC_VISIBILITY=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff b/arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff
deleted file mode 100644
index 22abf310b..000000000
--- a/arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-commit ea2b20ed7ab3e83b8585e20d2febdbb5f2d356c1
-Author: Michele Calgaro <michele.calgaro@yahoo.it>
-Date: Mon Aug 2 11:24:50 2021 +0900
-
- Removed unused hardwareEvent code.
-
- Initialization of TDEHardwareDevices() always happens before the signal
- was connected. The constructor of TDEHardwareDevices() is the only place
- that was triggering the signal emission, so the code was non functional.
-
- Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-
-diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
-index 5f1f26e..085435c 100644
---- a/tdenetworkmanager/src/devicetraycomponent.cpp
-+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
-@@ -74,8 +74,6 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
-
- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
-
-- // Listen for hardware change events
-- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
- // Trigger an initial hardware information update
- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
-
-diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
-index 9427679..173464f 100644
---- a/tdenetworkmanager/src/tdenetman-tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
-@@ -963,14 +963,6 @@ void Tray::slotGenericDeviceRemoved(TDEGenericDevice *dev)
- }
- }
-
--void Tray::slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
-- if (event == TDEHardwareEvent::HardwareListModified) {
-- updateDeviceTrays();
-- connectTrayDeviceManager();
-- }
--}
--
- void Tray::slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message)
- {
- if (event == TDENetworkVPNEventType::LoginBanner) {
-@@ -1094,7 +1086,6 @@ Tray::Tray() : KSystemTray()
- // get notified about new/removed devices
- connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*)));
- connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceRemoved(TDEGenericDevice*)));
-- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)));
-
- // Notifications
- connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
-diff --git a/tdenetworkmanager/src/tdenetman-tray.h b/tdenetworkmanager/src/tdenetman-tray.h
-index d086902..6f4fdea 100644
---- a/tdenetworkmanager/src/tdenetman-tray.h
-+++ b/tdenetworkmanager/src/tdenetman-tray.h
-@@ -115,7 +115,6 @@ class Tray : public KSystemTray
- private slots:
- void slotGenericDeviceAdded(TDEGenericDevice*);
- void slotGenericDeviceRemoved(TDEGenericDevice*);
-- void slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString);
- void slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message);
-
- private:
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-index 2d4eccb..9b855ec 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-@@ -487,9 +487,6 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
- setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless");
- setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50");
-
-- // Listen for hardware change events
-- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
--
- // Trigger an initial hardware information update
- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
- }
diff --git a/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff b/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff
deleted file mode 100644
index 887c989f1..000000000
--- a/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff
+++ /dev/null
@@ -1,121 +0,0 @@
-commit e4e7853030d8efbf14e5ad6631c4cfb6b3601269
-Author: Michele Calgaro <michele.calgaro@yahoo.it>
-Date: Mon Aug 2 23:19:04 2021 +0900
-
- Removed unused hardwareEvent code - part 2.
-
- Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-
-diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
-index 085435c..2ea4e35 100644
---- a/tdenetworkmanager/src/devicetraycomponent.cpp
-+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
-@@ -75,7 +75,11 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
-
- // Trigger an initial hardware information update
-- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
-+ TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
-+ TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
-+
-+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
-+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)));
-
- m_pixmaps[TDENetworkConnectionStatus::Invalid] = "nm_no_connection";
- m_pixmaps[TDENetworkConnectionStatus::UnManaged] = "nm_no_connection";
-@@ -110,18 +114,6 @@ TQString DeviceTrayComponent::device() const
- return m_device;
- }
-
--void DeviceTrayComponent::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
-- if (event == TDEHardwareEvent::HardwareListModified) {
-- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
-- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
-- TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
--
-- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
-- connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)));
-- }
--}
--
- void DeviceTrayComponent::deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message) {
- kdDebug() << "DeviceTrayComponent::deviceEventHandler" << endl;
-
-diff --git a/tdenetworkmanager/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h
-index af0ccea..c3c40e1 100644
---- a/tdenetworkmanager/src/devicetraycomponent.h
-+++ b/tdenetworkmanager/src/devicetraycomponent.h
-@@ -59,7 +59,6 @@ class DeviceTrayComponent : public TrayComponent
- void deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
-
- private slots:
-- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString);
- void deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message);
-
- protected:
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-index 9b855ec..8811650 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-@@ -428,25 +428,6 @@ void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress)
- KNotifyClient::event( tray()->winId(), "tdenm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") );
- }
-
--void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
-- if (event == TDEHardwareEvent::HardwareListModified) {
-- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
-- TDENetworkConnectionManager* deviceConnMan = (dev)?dev->connectionManager():NULL;
--
-- // get notified when the device state changes
-- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
--
-- // get notified of all AP changes
-- connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)));
--
-- // force status update to ensure correct icon is shown on startup
-- if ((dev) && (deviceConnMan)) {
-- slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->deviceNode());
-- }
-- }
--}
--
- void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) {
- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
- TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
-@@ -487,8 +468,20 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
- setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless");
- setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50");
-
-- // Trigger an initial hardware information update
-- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
-+ // initial hardware information update
-+ TDENetworkDevice* netdev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
-+ TDENetworkConnectionManager* deviceConnMan = (netdev)?netdev->connectionManager():NULL;
-+
-+ // get notified when the device state changes
-+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
-+
-+ // get notified of all AP changes
-+ connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)));
-+
-+ // force status update to ensure correct icon is shown on startup
-+ if ((netdev) && (deviceConnMan)) {
-+ slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, netdev->deviceNode());
-+ }
- }
-
- WirelessDeviceTray::~WirelessDeviceTray ()
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-index 59a24a1..eb429b9 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-@@ -66,7 +66,6 @@ class WirelessDeviceTray : public DeviceTrayComponent
- void slotAccessPointRemoved(TDEMACAddress);
-
- private slots:
-- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString);
- void tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType);
- void sendUpdateUI();
-
diff --git a/arch/tde-extra/tde-tdepim/PKGBUILD b/arch/tde-extra/tde-tdepim/PKGBUILD
index 9d00f1810..706aed242 100644
--- a/arch/tde-extra/tde-tdepim/PKGBUILD
+++ b/arch/tde-extra/tde-tdepim/PKGBUILD
@@ -1,33 +1,36 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdepim
-pkgver=14.0.10
+_mod=tdepim
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="Trinity Desktop PIM Components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdepim'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('boost' 'boost-libs' 'gnokii' 'libxss' 'xscreensaver' 'tde-tdelibs' 'tde-libcaldav' 'tde-libcarddav')
-makedepends=('pkgconfig' 'cmake' )
-provides=('tdepim')
-replaces=('trinity-tdepim')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdepim-trinity-${pkgver}.tar.xz")
-md5sums=('894562acd7c895da37d8af30b4f1fc61')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('55519a87ac6c16da15c4b1364e2c33f3')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
-
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_C_FLAGS="-fpermissive" \
-DCMAKE_CXX_FLAGS="-fpermissive" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -36,13 +39,13 @@ build() {
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
# Removing /opt/trinity/share/icons/default.tde to prevent a conflict
rm -rf ${pkgdir}/opt/trinity/share/icons/default.tde
}
diff --git a/arch/tde-extra/tde-tdepowersave/PKGBUILD b/arch/tde-extra/tde-tdepowersave/PKGBUILD
index a9c5d20c5..968037a4b 100644
--- a/arch/tde-extra/tde-tdepowersave/PKGBUILD
+++ b/arch/tde-extra/tde-tdepowersave/PKGBUILD
@@ -2,34 +2,32 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=tdepowersave
-_cat=applications/
+_cat=applications/system/
_kdemod="${_mod/tde/kde}"
-pkgname="tde-$_mod"
-pkgver=14.0.10
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
pkgrel=1
-pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
+pkgdesc="Trinity Desktop Enviroment - ${_mod}"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/$_mod"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
-#provides=("$_mod")
+provides=("${_mod}")
groups=('tde-extra')
depends=(
'tde-tdelibs'
'tde-dbus-1-tqt'
'libxss'
)
-makedepends=(
- 'cmake'
- 'pkgconfig'
-)
+makedepends=('tde-cmake-trinity')
optdepends=()
-confilicts=("trinity-$_kdemod" "kdemod3-$_kdemod")
-#replaces=("trinity-$_mod")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R$pkgver/main/$_cat$_mod-trinity-$pkgver.tar.xz")
-md5sums=('64daecf2c9061f3797b2cab8f0ad347b')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('68686e75e26795c31d051cf84e0fd06a')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -42,17 +40,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
-DWITH_GCC_VISIBILITY=ON
msg "Building - ${pkgname#*-}..."
- make VERBOSE=1 $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdesudo/PKGBUILD b/arch/tde-extra/tde-tdesudo/PKGBUILD
index 07b0ff58b..6c62c34c9 100644
--- a/arch/tde-extra/tde-tdesudo/PKGBUILD
+++ b/arch/tde-extra/tde-tdesudo/PKGBUILD
@@ -1,31 +1,30 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdesudo
-pkgver=14.0.10
+_mod=tdesudo
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDE Sudo"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdesudo'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tdesudo')
-#conflicts=('tdesudo')
-#replaces=('tdesudo')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdesudo-trinity-${pkgver}.tar.xz"
- 'bp000-1136b8150f.diff')
-md5sums=('ff1b28acd12998c216e4256ca94f795b'
- '6ba546544bfab644bbbba972f31a137b')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5943e82101e4a19499fcfd8cc21388e4')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < $srcdir/bp000-1136b8150f.diff
-
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p $srcdir/build
cd $srcdir/build
@@ -34,16 +33,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff b/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff
deleted file mode 100644
index 60bd6082c..000000000
--- a/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1136b8150f58e909eaa094d991dcefa81b8f6a60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 19:45:01 +0200
-Subject: Fix ftbfs on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: ordered comparison of pointer with integer zero ('char*' and 'int')
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- tdesudo/tdesudo.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tdesudo/tdesudo.cpp b/tdesudo/tdesudo.cpp
-index c255d0f..83158ab 100644
---- a/tdesudo/tdesudo.cpp
-+++ b/tdesudo/tdesudo.cpp
-@@ -205,7 +205,7 @@ TdeSudo::TdeSudo(TQWidget *parent, const char *name,const TQString& icon, const
- chmod(m_tmpname.ascii(),0644);
-
- QCStringList output;
-- while (fgets(buf, 1024, f) > 0)
-+ while (fgets(buf, 1024, f) != NULL)
- output += buf;
- if (pclose(f) < 0) {
- kdError() << k_lineinfo << "Could not run xauth.\n";
---
-cgit v1.2.1
-
diff --git a/arch/tde-extra/tde-tdetoys/PKGBUILD b/arch/tde-extra/tde-tdetoys/PKGBUILD
index 9b2bbde2e..445bb144a 100644
--- a/arch/tde-extra/tde-tdetoys/PKGBUILD
+++ b/arch/tde-extra/tde-tdetoys/PKGBUILD
@@ -1,43 +1,46 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdetoys
-pkgver=14.0.10
+_mod=tdetoys
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdetoys'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Toys"
depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdetoys')
-conflicts=('trinity-tdetoys' 'trinity-kdetoys')
-replaces=('trinity-tdetoys')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdetoys-trinity-${pkgver}.tar.xz")
-md5sums=('f91d22efed453b5053e2110782d85d93')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2bb8f5d47d4e094e459597b5069b7a3d')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdmtheme/PKGBUILD b/arch/tde-extra/tde-tdmtheme/PKGBUILD
index c6c368ab2..8d931d10e 100644
--- a/arch/tde-extra/tde-tdmtheme/PKGBUILD
+++ b/arch/tde-extra/tde-tdmtheme/PKGBUILD
@@ -1,22 +1,26 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdmtheme
-pkgver=14.0.10
+_mod=tdmtheme
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDM Theme"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdmtheme'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tdmtheme')
-#conflicts=('tdmtheme')
-#replaces=('tdmtheme')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdmtheme-trinity-${pkgver}.tar.xz")
-md5sums=('b085fa2792024415fb2174633875adbe')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6428e97a82389819dd02e1608cd43b8b')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -27,16 +31,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tork/PKGBUILD b/arch/tde-extra/tde-tork/PKGBUILD
index e5660beb6..ff7dbd53b 100644
--- a/arch/tde-extra/tde-tork/PKGBUILD
+++ b/arch/tde-extra/tde-tork/PKGBUILD
@@ -2,10 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=tork
-_cat=applications/
+_cat=applications/internet/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
pkgrel=1
pkgdesc="Anonymity manager for TDE"
arch=('i686' 'x86_64')
@@ -18,34 +19,27 @@ depends=(
'geoip'
'torsocks'
)
-makedepends=(
- 'cmake'
- 'pkgconfig'
-)
+makedepends=('tde-cmake-trinity')
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
- 'bp000-7576a4bf.diff')
-md5sums=('1f17070b8891a8fdd883b45cea74c72d'
- '132b051287bfbfd41e2c50110027525b')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5833c06b815dc333f921dfdc6d7d844b')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd ${srcdir}/${_mod}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-7576a4bf.diff
-
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p "$srcdir/build"
cd "$srcdir/build"
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -53,11 +47,11 @@ build() {
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tork/bp000-7576a4bf.diff b/arch/tde-extra/tde-tork/bp000-7576a4bf.diff
deleted file mode 100644
index 64db42995..000000000
--- a/arch/tde-extra/tde-tork/bp000-7576a4bf.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7576a4bfe86835552ede116488e70baae64df9e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 20:34:45 +0200
-Subject: Fix ftbfs on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: ordered comparison of pointer with integer zero (‘TQListViewItem*’ and ‘int’)
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- src/torkview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/torkview.cpp b/src/torkview.cpp
-index 1dd8b5d..ce32aea 100644
---- a/src/torkview.cpp
-+++ b/src/torkview.cpp
-@@ -1312,7 +1312,7 @@ void torkView::activeServersUpdated( const TQStringList &servers)
- {
- if ((*it).isEmpty())
- continue;
-- if ( (tm = serverList->findItem((*it),1)) > 0){
-+ if ( (tm = serverList->findItem((*it),1)) != NULL){
- tm->setPixmap(0,TQPixmap(SmallIcon("tork_green")));
- }else{
- tm = new TQListViewItem(serverList, (*it));
---
-cgit v1.2.1
-
diff --git a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
index b23465403..cbe5cf1d2 100644
--- a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
+++ b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
@@ -1,54 +1,50 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-twin-style-crystal
-pkgver=14.0.10
+_mod=twin-style-crystal
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="TDE TWin Style Crystal"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
-#provides=('twin-style-crystal')
-#conflicts=('twin-style-crystal')
-#replaces=('twin-style-crystal')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_kdemod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/twin-style-crystal-trinity-${pkgver}.tar.xz")
-md5sums=('b87b5ad84ba492e6e56c583c05ba4d40')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('b435ddeae50565fd440dc3705f503218')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- ## Generate config files and update with autoreconf
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-
- msg "Copying system libtool files...."
- cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
- cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
-
- msg "Running make -f admin/Makefile.common ...."
- make -f admin/Makefile.common
-
- ## configure
- msg "Configuring - ${pkgname#*-}..."
- ./configure \
- --prefix=${TDEDIR} \
- --with-qt-dir=${QTDIR} \
- --with-qt-includes=${QTDIR}/include \
- --with-qt-libraries=${QTDIR}/lib \
- --sysconfdir=${TDEDIR}/etc \
- --localstatedir=/var \
- --enable-closure
-
- msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building - ${pkgname}..."
+ ninja $NUMJOBS
}
package() {
- msg "Packaging - $pkgname-$pkgver"
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- make -j1 DESTDIR="${pkgdir}" install
+ msg "Packaging - ${pkgname}-${pkgver}"
+ cd "$srcdir/build"
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-yakuake/PKGBUILD b/arch/tde-extra/tde-yakuake/PKGBUILD
index 81977b50f..6ae669d96 100644
--- a/arch/tde-extra/tde-yakuake/PKGBUILD
+++ b/arch/tde-extra/tde-yakuake/PKGBUILD
@@ -2,10 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=yakuake
-_cat=applications/
+_cat=applications/system/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
pkgrel=1
pkgdesc="A Quake-style terminal emulator based on TDE Konsole technology"
arch=('i686' 'x86_64')
@@ -16,18 +17,15 @@ groups=('tde-complete')
depends=(
'tde-tdelibs'
)
-makedepends=(
- 'cmake'
- 'pkgconfig'
-)
+makedepends=('tde-cmake-trinity')
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('87c4355c77e561d36d35ea46b66f6375')
+md5sums=('77fb98c6bfd0d5e91b38417ae39083e4')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -39,6 +37,7 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -46,11 +45,11 @@ build() {
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-libs/tde-libcaldav/PKGBUILD b/arch/tde-libs/tde-libcaldav/PKGBUILD
index ecd9051e5..2759e3d0e 100644
--- a/arch/tde-libs/tde-libcaldav/PKGBUILD
+++ b/arch/tde-libs/tde-libcaldav/PKGBUILD
@@ -1,44 +1,47 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contribuitor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-libcaldav
-pkgver=14.0.10
+_mod=libcaldav
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libcaldav"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-libs')
depends=('curl' 'glib2')
-makedepends=('doxygen' 'pkgconfig' 'cmake')
+makedepends=('doxygen' 'tde-cmake-trinity')
optdepends=()
-provides=('libcaldav')
-# conflicts=()
-replaces=('trinity-libcaldav')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcaldav-trinity-${pkgver}.tar.xz")
-md5sums=('3d1b4997e4789c5b3a5389f5b58fd4f0')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('75662017b1a02ffc631e5120b7addfd0')
_prefix=/usr
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DWITH_GCC_VISIBILITY=ON
msg "Building $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-libs/tde-libcarddav/PKGBUILD b/arch/tde-libs/tde-libcarddav/PKGBUILD
index 96a67ea17..58250939e 100644
--- a/arch/tde-libs/tde-libcarddav/PKGBUILD
+++ b/arch/tde-libs/tde-libcarddav/PKGBUILD
@@ -1,41 +1,45 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty@gmail.com>
-pkgname=tde-libcarddav
-pkgver=14.0.10
+_mod=libcarddav
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="A client library adding support for the CardDAV protocol"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libcarddav"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
groups=('tde-libs')
depends=('curl')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
license=('GPL')
-provides=('libcarddav')
+provides=("${_mod}")
# conflicts=()
-replaces=('trinity-libcarddav')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcarddav-trinity-${pkgver}.tar.xz")
-md5sums=('54a5c89bb094ec40cc8cd5734233f743')
+replaces=("trinity-${_mod}")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('79e1c4e92751eb72c843ce0ddc70e5fe')
_prefix=/usr
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DWITH_GCC_VISIBILITY=ON
msg "Building $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-libs/tde-libkdcraw/PKGBUILD b/arch/tde-libs/tde-libkdcraw/PKGBUILD
index e6f6e58b6..9dd9cfdc2 100644
--- a/arch/tde-libs/tde-libkdcraw/PKGBUILD
+++ b/arch/tde-libs/tde-libkdcraw/PKGBUILD
@@ -1,66 +1,49 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-libkdcraw
-pkgver=14.0.10
+_mod=libkdcraw
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-libs')
depends=('tde-tdelibs' 'libraw' 'lcms2')
-makedepends=('pkgconfig' 'autoconf' 'imake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkdcraw-trinity-${pkgver}.tar.xz")
-md5sums=('fedf15518c80f85174071df185a45c88')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2daaa1a383d0ccdfd914c29db7f05c37')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- ## Generate config files and update with autoreconf
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-
- msg "Copying system libtool files...."
- cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
- cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
-
- msg "Running autotools, libtoolize, aclocal, autoupdate, autoconf, automake, autoreconf"
- aclocal
- autoupdate
- autoconf
- automake --add-missing
-
- msg "Running make -f admin/Makefile.common ...."
- make -f admin/Makefile.common
-
- ## configure
- msg "Configuring - ${pkgname}..."
-
- ./configure \
- --prefix=${TDEDIR} \
- --with-qt-dir=${QTDIR} \
- --with-qt-includes=${QTDIR}/include \
- --with-qt-libraries=${QTDIR}/lib \
- --localstatedir=/var \
- --enable-debug=full \
- --enable-closure
-
- ## make $NUMJOBS
- msg "Building - ${pkgname}..."
- make $NUMJOBS
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building $pkgname..."
+ ninja $NUMJOBS
}
package() {
- msg "Packaging - $pkgname-$pkgver"
-
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} # use for non-out-of-source
-
- make -j1 DESTDIR="$pkgdir" install
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-libs/tde-libkexiv2/PKGBUILD b/arch/tde-libs/tde-libkexiv2/PKGBUILD
index 68181afa8..3d89af561 100644
--- a/arch/tde-libs/tde-libkexiv2/PKGBUILD
+++ b/arch/tde-libs/tde-libkexiv2/PKGBUILD
@@ -1,44 +1,48 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-libkexiv2
-pkgver=14.0.10
+_mod=libkexiv2
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
pkgrel=1
pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-libs')
depends=('tde-tdelibs' 'exiv2')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkexiv2-trinity-${pkgver}.tar.xz")
-md5sums=('0647354c2cc1da9f54cd0d0707b026a3')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('94635dfeca198fce57cb45a15d31a222')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON
msg "Building $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-meta/PKGBUILD b/arch/tde-meta/PKGBUILD
index 91a64e928..863867c1f 100644
--- a/arch/tde-meta/PKGBUILD
+++ b/arch/tde-meta/PKGBUILD
@@ -1,12 +1,13 @@
pkgname=tde-meta
-pkgver=14.0.10
-pkgrel=2
+pkgver=14.0.11
+pkgrel=1
pkgdesc="Trinity Desktop Environment"
arch=('any')
url="https://www.trinitydesktop.org/"
license=('GPL')
depends=(
# tde-base
+ 'tde-i18n'
'tde-tdeadmin'
'tde-tdeartwork'
'tde-tdebindings'
@@ -16,11 +17,13 @@ depends=(
# tde-core
'tde-arts'
'tde-avahi-tqt'
+ 'tde-cmake-trinity'
'tde-dbus-1-tqt'
'tde-dbus-tqt'
'tde-libart-lgpl'
'tde-tdebase'
'tde-tdelibs'
+ 'tde-tqca'
'tde-tqca-tls'
'tde-tqt3'
'tde-tqtinterface'
@@ -38,6 +41,7 @@ depends=(
# tde-extra
'tde-abakus'
+ 'tde-akode'
'tde-amarok'
'tde-basket'
'tde-gtk3-tqt-engine'
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
index 9737d93a4..38f031651 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
@@ -1,2 +1,2 @@
INSTALL
-README
+README.md
diff --git a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..ed34bb3c2 100644
--- a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -31,8 +31,6 @@ debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
debian/tmp/opt/trinity/lib/ruby_lib/* /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
debian/tmp/opt/trinity/bin/amarok
debian/tmp/opt/trinity/bin/amarokapp
debian/tmp/opt/trinity/bin/amarok_libvisual
diff --git a/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control
index 00d0b4b9c..b08143d1e 100644
--- a/debian/_base/applications/multimedia/amarok/debian/control
+++ b/debian/_base/applications/multimedia/amarok/debian/control
@@ -17,7 +17,7 @@ Homepage: http://amarok.kde.org
Package: amarok-trinity
Architecture: any
-Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
+Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
Replaces: amarok-trinity (<< 4:14.0.0~)
Breaks: amarok-trinity (<< 4:14.0.0~)
Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
@@ -45,6 +45,16 @@ Description: versatile and easy to use audio player for Trinity
Support for libvisual visualization plugins is also compiled in (you need
to have libvisual-0.4-plugins installed to be able to use it).
+Package: libamarok-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Breaks: amarok-trinity (<< 4:14.0.11~)
+Replaces: amarok-trinity (<< 4:14.0.11~)
+Description: base library for Amarok [Trinity]
+ This package contains base library needed for Amarok to run properly.
+ Therefore, unless you have 'amarok' package installed, you will hardly
+ find this package useful.
+
Package: amarok-common-trinity
Architecture: all
Depends: ruby
@@ -72,7 +82,7 @@ Description: Amarok sidebar for konqueror [Trinity]
Package: amarok-engines-trinity
Architecture: all
Depends: amarok-engine-xine-trinity (>= ${source:Version}) | amarok-engine-akode-trinity (>= ${source:Version})
-Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version})
Replaces: amarok-engines-trinity (<< 4:14.0.0~)
Breaks: amarok-engines-trinity (<< 4:14.0.0~)
Description: output engines for the Amarok music player [Trinity]
@@ -100,18 +110,6 @@ Description: xine engine for the Amarok audio player [Trinity]
for some reason over the other engines (e.g., it is the lightest engine
Dependency-wise).
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features
- (like visualizations) might not be available while using this engine.
-
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
diff --git a/debian/_base/applications/multimedia/amarok/debian/docs b/debian/_base/applications/multimedia/amarok/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/multimedia/amarok/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libamarok.so.0
+debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/debian/_base/applications/multimedia/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..55c147b76 100755
--- a/debian/_base/applications/multimedia/amarok/debian/rules
+++ b/debian/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
-DWITH_IFP="OFF"
diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/docs b/debian/_base/applications/multimedia/mplayerthumbs/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/multimedia/mplayerthumbs/debian/docs
+++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/office/basket/debian/docs b/debian/_base/applications/office/basket/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/office/basket/debian/docs
+++ b/debian/_base/applications/office/basket/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/office/kbibtex/debian/docs b/debian/_base/applications/office/kbibtex/debian/docs
index c17f03764..960f99591 100644
--- a/debian/_base/applications/office/kbibtex/debian/docs
+++ b/debian/_base/applications/office/kbibtex/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
NEWS
-README
+README.md
TODO
diff --git a/debian/_base/applications/office/kbookreader/debian/docs b/debian/_base/applications/office/kbookreader/debian/docs
index 7d96d4e7e..76c3076c9 100644
--- a/debian/_base/applications/office/kbookreader/debian/docs
+++ b/debian/_base/applications/office/kbookreader/debian/docs
@@ -1,2 +1,3 @@
AUTHORS
+README.md
TODO
diff --git a/debian/_base/applications/office/kile/debian/control b/debian/_base/applications/office/kile/debian/control
index 696646d5a..e6c22beb3 100644
--- a/debian/_base/applications/office/kile/debian/control
+++ b/debian/_base/applications/office/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://kile.sourceforge.net
diff --git a/debian/_base/applications/office/kile/debian/patches/.gitignore b/debian/_base/applications/office/kile/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/office/kile/debian/patches/.gitignore
+++ b/debian/_base/applications/office/kile/debian/patches/series
diff --git a/debian/_base/applications/office/kile/debian/rules b/debian/_base/applications/office/kile/debian/rules
index bd5478578..59bca7cd4 100755
--- a/debian/_base/applications/office/kile/debian/rules
+++ b/debian/_base/applications/office/kile/debian/rules
@@ -1,60 +1,39 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-install/kile-trinity-i18n-br::
- -for language in `cd translations; ls -1d */`; do \
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/$$language; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-$$language; \
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
+
+common-install-indep::
+ # Install translations into individual packages
+ -for language in `cd debian/tmp/opt/trinity/share/locale; ls -1d */`; do \
+ pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+ install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale; \
+ cp -a $(CURDIR)/debian/tmp/opt/trinity/share/locale/$$language \
+ $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale/$$language; \
+ done
+ -for language in `cd debian/tmp/opt/trinity/share/doc/tde/HTML; ls -1d */ | grep -v '^en/'`; do \
+ pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+ install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML; \
+ cp -a $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/$$language \
+ $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML/$$language; \
done
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/en_GB/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-engb
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/pt_BR/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-ptbr
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/sr@Latn/;\
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-srlatin
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/zh_CN/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-zhcn
install/kile-trinity::
# Install pixmap
install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm
- chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh
-
clean::
rm -rf debian/kile-trinity-i18n-*
diff --git a/debian/_base/applications/office/kile/debian/watch b/debian/_base/applications/office/kile/debian/watch
deleted file mode 100644
index e372a7062..000000000
--- a/debian/_base/applications/office/kile/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/debian/_base/applications/office/knowit/debian/docs b/debian/_base/applications/office/knowit/debian/docs
index 5502ed8f4..960f99591 100644
--- a/debian/_base/applications/office/knowit/debian/docs
+++ b/debian/_base/applications/office/knowit/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
NEWS
-README
+README.md
TODO
diff --git a/debian/_base/applications/office/tellico/debian/docs b/debian/_base/applications/office/tellico/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/office/tellico/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/settings/kdpkg/debian/docs b/debian/_base/applications/settings/kdpkg/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/applications/settings/kdpkg/debian/docs
+++ b/debian/_base/applications/settings/kdpkg/debian/docs
@@ -1 +1,2 @@
AUTHORS
+README.md
diff --git a/debian/_base/applications/settings/kima/debian/docs b/debian/_base/applications/settings/kima/debian/docs
index 1a4f0317f..1a960e71b 100644
--- a/debian/_base/applications/settings/kima/debian/docs
+++ b/debian/_base/applications/settings/kima/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
FAQ
-README
+README.md
TODO
diff --git a/debian/_base/applications/settings/kiosktool/debian/docs b/debian/_base/applications/settings/kiosktool/debian/docs
index 724e08449..6f7727790 100644
--- a/debian/_base/applications/settings/kiosktool/debian/docs
+++ b/debian/_base/applications/settings/kiosktool/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
TODO
diff --git a/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs b/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
+++ b/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/settings/klcddimmer/debian/docs b/debian/_base/applications/settings/klcddimmer/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/debian/_base/applications/settings/klcddimmer/debian/docs
+++ b/debian/_base/applications/settings/klcddimmer/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
NEWS
-README
+README.md
diff --git a/debian/_base/applications/settings/tde-systemsettings/debian/docs b/debian/_base/applications/settings/tde-systemsettings/debian/docs
index 087bcaaa1..76c3076c9 100644
--- a/debian/_base/applications/settings/tde-systemsettings/debian/docs
+++ b/debian/_base/applications/settings/tde-systemsettings/debian/docs
@@ -1,5 +1,3 @@
-AUTHOR
-README
-
-
-
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/settings/tdenetworkmanager/debian/docs b/debian/_base/applications/settings/tdenetworkmanager/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/settings/tdenetworkmanager/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/settings/tdesudo/debian/docs b/debian/_base/applications/settings/tdesudo/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/settings/tdesudo/debian/docs
+++ b/debian/_base/applications/settings/tdesudo/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..960f99591 100644
--- a/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
@@ -1,4 +1,4 @@
-doc/AUTHORS
-doc/NEWS
-doc/README
-doc/TODO
+AUTHORS
+NEWS
+README.md
+TODO
diff --git a/debian/_base/applications/system/dolphin/debian/docs b/debian/_base/applications/system/dolphin/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/system/dolphin/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/system/katapult/debian/docs b/debian/_base/applications/system/katapult/debian/docs
index 777273e59..a2b373b4d 100644
--- a/debian/_base/applications/system/katapult/debian/docs
+++ b/debian/_base/applications/system/katapult/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/system/kcmautostart/debian/docs b/debian/_base/applications/system/kcmautostart/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/applications/system/kcmautostart/debian/docs
+++ b/debian/_base/applications/system/kcmautostart/debian/docs
@@ -1 +1,2 @@
AUTHORS
+README.md
diff --git a/debian/_base/applications/system/kdbusnotification/debian/docs b/debian/_base/applications/system/kdbusnotification/debian/docs
index e845566c0..b43bf86b5 100644
--- a/debian/_base/applications/system/kdbusnotification/debian/docs
+++ b/debian/_base/applications/system/kdbusnotification/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/_base/applications/system/klamav/debian/docs b/debian/_base/applications/system/klamav/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/system/klamav/debian/docs
+++ b/debian/_base/applications/system/klamav/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/system/knemo/debian/docs b/debian/_base/applications/system/knemo/debian/docs
index c17f03764..960f99591 100644
--- a/debian/_base/applications/system/knemo/debian/docs
+++ b/debian/_base/applications/system/knemo/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
NEWS
-README
+README.md
TODO
diff --git a/debian/_base/applications/system/knetload/debian/docs b/debian/_base/applications/system/knetload/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/system/knetload/debian/docs
+++ b/debian/_base/applications/system/knetload/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/system/knetstats/debian/docs b/debian/_base/applications/system/knetstats/debian/docs
index e845566c0..b43bf86b5 100644
--- a/debian/_base/applications/system/knetstats/debian/docs
+++ b/debian/_base/applications/system/knetstats/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/_base/applications/system/kshutdown/debian/docs b/debian/_base/applications/system/kshutdown/debian/docs
index 9341bcf45..d70cd6976 100644
--- a/debian/_base/applications/system/kshutdown/debian/docs
+++ b/debian/_base/applications/system/kshutdown/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
-README
+README.md
TODO
VERSION
diff --git a/debian/_base/applications/system/ksystemlog/debian/docs b/debian/_base/applications/system/ksystemlog/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/system/ksystemlog/debian/docs
+++ b/debian/_base/applications/system/ksystemlog/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/system/kvkbd/debian/docs b/debian/_base/applications/system/kvkbd/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/applications/system/kvkbd/debian/docs
+++ b/debian/_base/applications/system/kvkbd/debian/docs
@@ -1 +1,2 @@
AUTHORS
+README.md
diff --git a/debian/_base/applications/system/smartcardauth/debian/docs b/debian/_base/applications/system/smartcardauth/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/system/smartcardauth/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/docs b/debian/_base/applications/system/tdesshaskpass/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/docs b/debian/_base/applications/tdeio/tdeio-apt/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/tdeio/tdeio-apt/debian/docs
+++ b/debian/_base/applications/tdeio/tdeio-apt/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/docs b/debian/_base/applications/tdeio/tdeio-ftps/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/debian/_base/applications/tdeio/tdeio-ftps/debian/docs
+++ b/debian/_base/applications/tdeio/tdeio-ftps/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
INSTALL
-README
+README.md
diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/docs b/debian/_base/applications/tdeio/tdeio-sword/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/tdeio/tdeio-sword/debian/docs
+++ b/debian/_base/applications/tdeio/tdeio-sword/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
+++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/themes/ksplash-engine-moodin/debian/docs b/debian/_base/applications/themes/ksplash-engine-moodin/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
+++ b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/themes/tde-style-domino/debian/docs b/debian/_base/applications/themes/tde-style-domino/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/themes/tde-style-domino/debian/docs
+++ b/debian/_base/applications/themes/tde-style-domino/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/themes/tde-style-lipstik/debian/docs b/debian/_base/applications/themes/tde-style-lipstik/debian/docs
index 0948b8ef4..4c9a51eb2 100644
--- a/debian/_base/applications/themes/tde-style-lipstik/debian/docs
+++ b/debian/_base/applications/themes/tde-style-lipstik/debian/docs
@@ -1,4 +1,4 @@
+AUTHORS
BUGS
-README
+README.md
TODO
-AUTHORS
diff --git a/debian/_base/applications/utilities/filelight/debian/docs b/debian/_base/applications/utilities/filelight/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/utilities/filelight/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/utilities/kchmviewer/debian/docs b/debian/_base/applications/utilities/kchmviewer/debian/docs
index 1ed9b5bd5..b72409e5a 100644
--- a/debian/_base/applications/utilities/kchmviewer/debian/docs
+++ b/debian/_base/applications/utilities/kchmviewer/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
FAQ
-README
+README.md
diff --git a/debian/_base/applications/utilities/kdirstat/debian/docs b/debian/_base/applications/utilities/kdirstat/debian/docs
index 7f03542b1..871711684 100644
--- a/debian/_base/applications/utilities/kdirstat/debian/docs
+++ b/debian/_base/applications/utilities/kdirstat/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
CREDITS
-README
+README.md
TODO
diff --git a/debian/_base/applications/utilities/keep/debian/docs b/debian/_base/applications/utilities/keep/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/utilities/keep/debian/docs
+++ b/debian/_base/applications/utilities/keep/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/utilities/knutclient/debian/docs b/debian/_base/applications/utilities/knutclient/debian/docs
index e845566c0..0b6e0f321 100644
--- a/debian/_base/applications/utilities/knutclient/debian/docs
+++ b/debian/_base/applications/utilities/knutclient/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/debian/_base/applications/utilities/krename/debian/docs b/debian/_base/applications/utilities/krename/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/utilities/krename/debian/docs
+++ b/debian/_base/applications/utilities/krename/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/utilities/ksensors/debian/docs b/debian/_base/applications/utilities/ksensors/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/utilities/ksensors/debian/docs
+++ b/debian/_base/applications/utilities/ksensors/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/utilities/mathemagics/debian/docs b/debian/_base/applications/utilities/mathemagics/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/utilities/mathemagics/debian/docs
+++ b/debian/_base/applications/utilities/mathemagics/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/debian/_base/common/cmake/debian/control b/debian/_base/common/cmake/debian/control
index 1363e01ee..50ea830ef 100644
--- a/debian/_base/common/cmake/debian/control
+++ b/debian/_base/common/cmake/debian/control
@@ -2,7 +2,7 @@ Source: cmake-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
Standards-Version: 3.8.4
Package: cmake-trinity
diff --git a/debian/_base/core/tdebase/debian/control b/debian/_base/core/tdebase/debian/control
index 07d221106..0e9962316 100644
--- a/debian/_base/core/tdebase/debian/control
+++ b/debian/_base/core/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
Architecture: all
Replaces: kdebase-trinity (<< 4:14.0.0~)
Breaks: kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${source:Version})
Description: base components from the official TDE release
diff --git a/debian/_base/core/tdebindings/debian/control b/debian/_base/core/tdebindings/debian/control
index 171b3c80b..f56288575 100644
--- a/debian/_base/core/tdebindings/debian/control
+++ b/debian/_base/core/tdebindings/debian/control
@@ -1,7 +1,7 @@
Source: tdebindings-trinity
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
- default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc],
+ default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev
Section: devel
diff --git a/debian/_base/core/tdegraphics/debian/rules b/debian/_base/core/tdegraphics/debian/rules
index d29cd5566..5598266c2 100755
--- a/debian/_base/core/tdegraphics/debian/rules
+++ b/debian/_base/core/tdegraphics/debian/rules
@@ -26,9 +26,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_ALL="ON" \
- -DWITH_TIFF="ON" \
- -DWITH_OPENEXR="ON" \
- -DWITH_PDF="ON"
+ -DWITH_ALL_OPTIONS="ON"
DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg
diff --git a/debian/_base/core/tdetoys/debian/kweather-trinity.install b/debian/_base/core/tdetoys/debian/kweather-trinity.install
index 34499d446..4ce8d6ef8 100644
--- a/debian/_base/core/tdetoys/debian/kweather-trinity.install
+++ b/debian/_base/core/tdetoys/debian/kweather-trinity.install
@@ -2,10 +2,12 @@ debian/tmp/opt/trinity/bin/kweatherservice
debian/tmp/opt/trinity/bin/kweatherreport
debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.so
debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.la
-debian/tmp/opt/trinity/lib/trinity/kcm_weather.so
-debian/tmp/opt/trinity/lib/trinity/kcm_weather.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.la
debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so
debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.la
debian/tmp/opt/trinity/lib/trinity/kweatherreport.so
debian/tmp/opt/trinity/lib/trinity/kweatherreport.la
debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.la
@@ -27,5 +29,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kweather.png
debian/tmp/opt/trinity/share/man/man1/kweatherreport.1
debian/tmp/opt/trinity/share/man/man1/kweatherservice.1
debian/tmp/opt/trinity/share/services/kweatherservice.desktop
-debian/tmp/opt/trinity/share/services/kcmweather.desktop
+debian/tmp/opt/trinity/share/services/kcmweatherapplet.desktop
debian/tmp/opt/trinity/share/services/kcmweatherservice.desktop
+debian/tmp/opt/trinity/share/services/kcmweatherstations.desktop
diff --git a/debian/_base/dependencies/akode/debian/docs b/debian/_base/dependencies/akode/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/dependencies/akode/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl b/debian/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/dependencies/polkit-tqt/debian/changelog b/debian/_base/dependencies/polkit-tqt/debian/changelog
new file mode 100644
index 000000000..58e4a45de
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/changelog
@@ -0,0 +1,66 @@
+polkit-tqt (0.103.0-2) unstable; urgency=low
+
+ * Port to TQt3 and package renaming
+ * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Mon, 01 Nov 2021 14:03:00 +0900
+
+polkit-qt-1 (0.103.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - fix annoying crash on shutdown. (Closes: #651815)
+
+ [ Felix Geyer ]
+ * Modify CFLAGS/CXXFLAGS after including debian-qt-kde.mk so the changes are
+ not overwritten.
+
+ [ Fathi Boudra ]
+ * Update debian/compat: bump to 8.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 14 Dec 2011 09:15:10 -0500
+
+polkit-qt-1 (0.99.0-3) unstable; urgency=low
+
+ [ Modestas Vainius ]
+ * Update symbol files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 May 2011 00:31:01 +0300
+
+polkit-qt-1 (0.99.0-2) experimental; urgency=low
+
+ * Bump Standards-Version to 3.9.2: no changes needed.
+ * Build library with -fvisibility=hidden -fvisibility-inlines-hidden.
+ * Update symbol file: many private symbols are gone due to above.
+
+ -- Modestas Vainius <modax@debian.org> Thu, 28 Apr 2011 11:53:35 +0300
+
+polkit-qt-1 (0.99.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Modestas Vainius ]
+ * Add Vcs fields to debian/control.
+ * Switch debian/rules engine to qt-kde-team/2/*.
+ * Bump Standards-Version to 3.9.1: no changes needed.
+ * Remove dupe "Section" field from debian/control.
+ * Include verbatim BSD license to debian/copyright.
+ * Override lintian libpolkit-qt-1-0: package-name-doesnt-match-sonames.
+ * Use more failsafe wildcards in libpolkit-qt-1-0.install.
+ * Add myself to Uploaders.
+ * SONAME bumped: rename libpolkit-qt-1-0 to libpolkit-qt-1-1.
+ * Add symbol file for libpolkit-qt-1-1.
+ * Update debian/copyright.
+
+ [ Didier Raboud ]
+ * Bump B-D of libpolkit to >= 0.98.
+
+ [ José Manuel Santamaría Lema ]
+ * Update installed files.
+
+ -- Modestas Vainius <modax@debian.org> Mon, 14 Mar 2011 01:03:06 +0200
+
+polkit-qt-1 (0.95.1-1) unstable; urgency=low
+
+ * Initial release. (Closes: #565395)
+
+ -- Fathi Boudra <fabo@debian.org> Fri, 15 Jan 2010 12:50:13 +0100
diff --git a/debian/_base/dependencies/polkit-tqt/debian/compat b/debian/_base/dependencies/polkit-tqt/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/_base/dependencies/polkit-tqt/debian/control b/debian/_base/dependencies/polkit-tqt/debian/control
new file mode 100644
index 000000000..7da8dc684
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/control
@@ -0,0 +1,61 @@
+Source: polkit-tqt
+Section: devel
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev,
+ libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev
+Standards-Version: 3.9.2
+
+Package: libpolkit-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the files necessary for running applications that use
+ the libpolkit-tqt library.
+
+Package: libpolkit-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: libpolkit-tqt (= ${binary:Version}), libtqtinterface-dev
+Suggests: libpolkit-tqt-examples
+Description: PolicyKit-tqt development files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the development libraries and headers.
+
+Package: libpolkit-tqt-examples
+Section: libs
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library example files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains example files and applications.
diff --git a/debian/_base/dependencies/polkit-tqt/debian/copyright b/debian/_base/dependencies/polkit-tqt/debian/copyright
new file mode 100644
index 000000000..19e2663aa
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/copyright
@@ -0,0 +1,101 @@
+This code was ported to TQt3 and packaged for Debian by:
+ Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+ https://snapshot.debian.org/package/polkit-qt-1/0.103.0-1/
+
+Original polkit-qt-1 code was packaged for Debian by:
+
+ Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+ Daniel Nicoletti <dantti85-dev@yahoo.com.br>
+ Dario Freddi <drf@kde.org>
+ Jaroslav Reznik <jreznik@redhat.com>
+ Radek Novacek <rnovacek@redhat.com>
+ Lukas Tinkl <ltinkl@redhat.com>
+ Pino Toscano <pino@kde.org>
+
+Copyright:
+
+ Copyright (C) 2008-2009 Daniel Nicoletti
+ Copyright (C) 2009-2010 Dario Freddi
+ Copyright (C) 2009 Jaroslav Reznik
+ Copyright (C) 2009 Radek Novacek
+ Copyright (C) 2009 Lukas Tinkl
+
+Copyright for polkit-tqt-export.h file:
+
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
+ Copyright (C) 2007 David Faure <faure@kde.org>
+
+Copyright for polkittqt1-version.h.cmake file:
+
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
+ Copyright (C) 2007 Sebastian Trueg <trueg@kde.org>
+
+Copyright for cmake/modules/FindAutomoc4.cmake file:
+
+ Copyright (C) 2008-2009 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/MacroPushRequiredVars.cmake file:
+
+ Copyright (C) 2006 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/InstallSettings.cmake file:
+
+ Copyright (C) 2008 Kevin Krammer <kevin.krammer@gmx.at>
+
+License for cmake modules:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2' and
+`/usr/share/common-licenses/LGPL-3'.
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+ Copyright (C) 2011 Modestas Vainius <modax@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/debian/_base/dependencies/polkit-tqt/debian/docs b/debian/_base/dependencies/polkit-tqt/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
new file mode 100644
index 000000000..698c043d8
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
@@ -0,0 +1,31 @@
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/ActionDescription
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Listener
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Session
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Authority
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Details
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/Action
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButton
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButtons
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Identity
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Subject
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/TemporaryAuthorization
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-actiondescription.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-listener.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-session.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-authority.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-details.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-export.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-action.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbutton.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbuttons.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-identity.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-subject.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-temporaryauthorization.h
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-agent.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-core.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-gui.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-agent.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-core.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-gui.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/polkit-tqt.cmake
diff --git a/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
new file mode 100644
index 000000000..5bb70628a
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
@@ -0,0 +1,8 @@
+debian/tmp/etc/dbus-1/system.d/org.tqt.policykit.examples.conf
+debian/tmp/usr/bin/polkit-tqt-agent-example
+debian/tmp/usr/bin/polkit-tqt-example
+debian/tmp/usr/bin/polkit-tqt-example-helper
+debian/tmp/usr/share/apps/polkit-tqt/examples/*
+debian/tmp/usr/share/apps/polkit-tqt/icons/*
+debian/tmp/usr/share/dbus-1/system-services/org.tqt.policykit.examples.service
+debian/tmp/usr/share/polkit-1/actions/org.tqt.policykit.examples.policy
diff --git a/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
new file mode 100644
index 000000000..1bbe0900a
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-*.so.*
diff --git a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore b/debian/_base/dependencies/polkit-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore
+++ b/debian/_base/dependencies/polkit-tqt/debian/patches/series
diff --git a/debian/_base/dependencies/polkit-tqt/debian/rules b/debian/_base/dependencies/polkit-tqt/debian/rules
new file mode 100755
index 000000000..71edffe1c
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+ifdef DEB_HOST_MULTIARCH
+ CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+ CMAKE_INSTALL_LIBDIR = lib
+endif
+
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DBUILD_ALL="ON"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/debian/_base/dependencies/polkit-tqt/debian/source/format b/debian/_base/dependencies/polkit-tqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/dependencies/polkit-tqt/debian/source/options b/debian/_base/dependencies/polkit-tqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
index ae635cbcd..735874a93 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
@@ -1 +1 @@
-usr/share/sip/tqt
+usr/share/sip-tqt/tqt
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install
index 7b6aca191..0f144be95 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install
+++ b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install
@@ -1,2 +1 @@
-sip/* usr/share/sip/tqt
-
+sip/* usr/share/sip-tqt/tqt
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 36e6c1349..bd57734b2 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
@@ -1,15 +1,14 @@
# lintian test overriden as the files tripping this error are put into the source
# of the generated package. This is a false-positive
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
-
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip
diff --git a/debian/_base/dependencies/python-tqt/debian/rules b/debian/_base/dependencies/python-tqt/debian/rules
index 72a8d8dc0..9f597b2eb 100755
--- a/debian/_base/dependencies/python-tqt/debian/rules
+++ b/debian/_base/dependencies/python-tqt/debian/rules
@@ -58,12 +58,12 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* && echo yes \
| python$* ../configure.py \
- -c -n /usr/include/tqscintilla \
+ -c -n /usr/include/tqt3 \
-e python$* \
- -o /usr/lib -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \
- -v /usr/share/sip/tqt \
+ -v /usr/share/sip-tqt/tqt \
-m /usr/lib/python$*/config \
CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
touch $@
@@ -73,12 +73,12 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
- -c -n /usr/include/tqscintilla \
+ -c -n /usr/include/tqt3 \
-e python$* \
- -o /usr/lib -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \
- -v /usr/share/sip/tqt \
+ -v /usr/share/sip-tqt/tqt \
-m /usr/lib/python$*/config_d \
CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
touch $@
diff --git a/debian/_base/dependencies/python-tqt/debian/watch b/debian/_base/dependencies/python-tqt/debian/watch
deleted file mode 100644
index 506321d38..000000000
--- a/debian/_base/dependencies/python-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.com/software/pyqt/download3 \
- /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz
diff --git a/debian/_base/dependencies/sip4-tqt/debian/control b/debian/_base/dependencies/sip4-tqt/debian/control
index bdd8f4eb0..68283ead1 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/control
+++ b/debian/_base/dependencies/sip4-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex
Standards-Version: 3.8.4
XS-Python-Version: all
@@ -67,4 +67,3 @@ Description: Python/C++ bindings generator development files
.
This package contains the code generator tool and the development headers
needed to develop Python bindings with sip.
-
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1 b/debian/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
index ce178cc7e..ef824974f 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1
+++ b/debian/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
@@ -1,26 +1,26 @@
.\"
.\" Created by Ricardo Crdenes Medina <ricardo@conysis.com>
-.\" for the Debian 'sip' package
+.\" for the Debian 'sip-tqt' package
.\"
-.TH SIP 1 "2010/02/02"
+.TH SIP-TQT 1 "2010/02/02"
.SH NAME
-sip \- generates C++/Python bindings
+sip-tqt \- generates C++/Python bindings
.SH SYNOPSIS
-.B sip
+.B sip-tqt
[\fI-h\fR] [\fI-V\fR] [\fI-a file\fR] [\fI-c dir\fR] [\fI-d file\fR] [\fI-e\fR] [\fI-g\fR] [\fI-I dir\fR] [\fI-j #\fR] [\fI-k\fR] [\fI-m file\fR] [\fI-o\fR] [\fI-p module\fR] [\fI-P\fR] [\fI-r\fR] [\fI-s suffix\fR] [\fI-t tag\fR] [\fI-w\fR] [\fI-x feature\fR] [\fI-z file\fR] [\fIfile\fR]
.SH DESCRIPTION
-.B sip
+.B sip-tqt
takes a set of specification files and generates C++ code, documentation and build files.
The format of the needed specification file is similar to a C++ header.
-sip includes run-time support for the generated code.
+sip-tqt includes run-time support for the generated code.
.SH OPTIONS
.TP
.B \-h
Show summary of options.
.TP
.B \-V
-Display the sip version number
+Display the sip-tqt version number
.TP
.B \-a file
The name of the QScintilla API file. If not indicated, it will not
@@ -43,7 +43,7 @@ Enable support for exceptions. Disabled by default.
Always release and reaquire the GIL.
.TP
.B -I dir
-Directory where sip can search for included files.
+Directory where sip-tqt can search for included files.
.TP
.B -j number
Splits the generated code in \fInumber\fR files (1 by default). This
@@ -66,7 +66,7 @@ The suffix used for generated C or C++ files (".c" or ".cpp" if none specified)
.TP
.B -t tag
The primary version to tag generate code for. You only can specify those
-defined with a %Timeline directive. If you don't specify one, sip
+defined with a %Timeline directive. If you don't specify one, sip-tqt
will generate the latest available.
.TP
.B -w
@@ -80,7 +80,7 @@ The name of a file containing additional command line flags
.TP
.B file
The name of the file containing the specification. If you skip it,
-sip will expect to be fed by stdin.
+sip-tqt will expect to be fed by stdin.
.SH AUTHOR
This manual page was written by Ricardo Javier Cardenes Medina <rcardenes@debian.org> and Torsten Marek <shlomme@debian.org>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
index ba33bb512..b3b0eafea 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
@@ -1,2 +1,2 @@
-debian/manpages/sip.1
+debian/manpages/sip-tqt.1
debian/manpages/dh_sip_tqt.1
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..bfa1b37f6 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python*/*-packages/sip_tqt.so
diff --git a/debian/_base/dependencies/sip4-tqt/debian/rules b/debian/_base/dependencies/sip4-tqt/debian/rules
index 1feb9c154..1b07c97d2 100755
--- a/debian/_base/dependencies/sip4-tqt/debian/rules
+++ b/debian/_base/dependencies/sip4-tqt/debian/rules
@@ -47,7 +47,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* \
&& python$* ../configure.py \
- -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
-g python$* \
-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
touch $@
@@ -57,7 +57,7 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* \
&& python$*-dbg ../configure.py \
- -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
-g python$* \
-e /usr/include/python$*_d \
-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
@@ -110,18 +110,17 @@ install-arch: build
install-arch-%:
$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg
- mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
- touch debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/__init__.py
- install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
- install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py
- install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
+ mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/
+ install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
+ install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
+ install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
- install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/
+ install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev/usr/include/python$*/
mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
- ln -s ../python$*/sip.h \
- debian/python-sip-tqt-dev/usr/include/python$*_d/sip.h
- mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
- install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
+ ln -s ../python$*/sip-tqt.h \
+ debian/python-sip-tqt-dev/usr/include/python$*_d/sip-tqt.h
+ mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
+ install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
# Must not depend on anything. This is to be called by
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
new file mode 100644
index 000000000..33ebcb65b
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
@@ -0,0 +1,13 @@
+# import the sip_tqt_config.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+ try:
+ from sip_tqt_config_d import *
+ from sip_tqt_config_d import _pkg_config, _default_macros
+ except ImportError, msg:
+ raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed'
+else:
+ from sip_tqt_config_nd import *
+ from sip_tqt_config_nd import _pkg_config, _default_macros
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py b/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py
deleted file mode 100644
index a9e761f08..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# import the sipconfig.py for the normal or the debug build
-
-import sys
-
-if getattr(sys, "pydebug", False):
- try:
- from sipconfig_d import *
- from sipconfig_d import _pkg_config, _default_macros
- except ImportError, msg:
- raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed'
-else:
- from sipconfig_nd import *
- from sipconfig_nd import _pkg_config, _default_macros
diff --git a/debian/_base/dependencies/sip4-tqt/debian/watch b/debian/_base/dependencies/sip4-tqt/debian/watch
deleted file mode 100644
index 1ff1f0839..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.co.uk/software/sip/download \
- /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate
diff --git a/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/dependencies/tqscintilla/debian/cdbs/versions.pl b/debian/_base/dependencies/tqscintilla/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/dependencies/tqscintilla/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/dependencies/tqscintilla/debian/control b/debian/_base/dependencies/tqscintilla/debian/control
index e89abba2a..9d4458b48 100644
--- a/debian/_base/dependencies/tqscintilla/debian/control
+++ b/debian/_base/dependencies/tqscintilla/debian/control
@@ -3,15 +3,17 @@ Section: libs
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: debhelper (>= 9~), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
Standards-Version: 3.8.4
Package: libtqscintilla7
Section: libs
Architecture: any
+Multi-Arch: same
Replaces: libtqscintilla7 (<< 4:14.0.0~)
Breaks: libtqscintilla7 (<< 4:14.0.0~)
Depends: ${shlibs:Depends}
+Recommends: libtqscintilla7-i18n
Description: TQt source code editing component based on Scintilla
Scintilla is a free source code editing component. It has features found
in standard editing components, as well as features especially useful
@@ -19,9 +21,23 @@ Description: TQt source code editing component based on Scintilla
.
TQScintilla is a port or Scintilla to the TQt GUI toolkit.
+Package: libtqscintilla7-i18n
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Replaces: libtqscintilla7 (<< 4:14.0.12~)
+Breaks: libtqscintilla7 (<< 4:14.0.12~)
+Description: i18n files for TQScintilla library
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ This package contains the internationalization files for the TQScintilla library.
+
Package: libtqscintilla-dev
Section: libdevel
-Architecture: all
+Architecture: any
+Multi-Arch: foreign
Replaces: libtqscintilla-dev (<< 4:14.0.0~)
Breaks: libtqscintilla-dev (<< 4:14.0.0~)
Depends: libtqscintilla7 (>= ${source:Version})
@@ -36,6 +52,7 @@ Description: TQt source code editing component - development files
Package: libtqscintilla-doc
Section: doc
Architecture: all
+Multi-Arch: foreign
Replaces: libtqscintilla-doc (<< 4:14.0.0~)
Breaks: libtqscintilla-doc (<< 4:14.0.0~)
Suggests: libtqscintilla-dev
diff --git a/debian/_base/dependencies/tqscintilla/debian/dirs b/debian/_base/dependencies/tqscintilla/debian/dirs
deleted file mode 100644
index ca882bbb7..000000000
--- a/debian/_base/dependencies/tqscintilla/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/_base/dependencies/tqscintilla/debian/docs b/debian/_base/dependencies/tqscintilla/debian/docs
index edc007104..50bd824bb 100644
--- a/debian/_base/dependencies/tqscintilla/debian/docs
+++ b/debian/_base/dependencies/tqscintilla/debian/docs
@@ -1 +1,2 @@
NEWS
+README
diff --git a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
index e183cf963..8a9449faa 100644
--- a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
+++ b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
@@ -1,2 +1,3 @@
usr/include
-usr/lib/*.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so
diff --git a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 005276324..d66379c9a 100644
--- a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -1 +1 @@
-usr/share/doc/libtqscintilla-doc
+usr/share/doc/libtqscintilla/HTML
diff --git a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
new file mode 100644
index 000000000..8fc621fc3
--- /dev/null
+++ b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
@@ -0,0 +1 @@
+usr/share/tqt3/translations/*.qm
diff --git a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
index 2cfef7f8a..b3c140659 100644
--- a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -1,3 +1,2 @@
-usr/lib/*.so.*
-usr/lib/tqt3/plugins/designer/*.so
-usr/share/tqt3/translations/*.qm
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*.so
diff --git a/debian/_base/dependencies/tqscintilla/debian/rules b/debian/_base/dependencies/tqscintilla/debian/rules
index e87355584..bcf875516 100755
--- a/debian/_base/dependencies/tqscintilla/debian/rules
+++ b/debian/_base/dependencies/tqscintilla/debian/rules
@@ -1,117 +1,20 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
+ifdef DEB_HOST_MULTIARCH
+ CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+ CMAKE_INSTALL_LIBDIR = lib
endif
-# This is the debhelper compatibility version to use.
-export TQTDIR=/usr/share/tqt3
-export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
-DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html
-HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla
-LIBSDEST=$(CURDIR)/debian/tmp/usr/lib
-TRANSDEST=$(CURDIR)/debian/tmp/$(TQTDIR)/translations
-PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/designer
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- cd qt; qmake "DESTDIR=$(CURDIR)/tmplib"
- cd designer; qmake
- touch configure-stamp
-
-build build-arch: build-stamp
-build-indep:
-
-build-stamp: configure-stamp
- dh_testdir
-
- install -d $(CURDIR)/tmplib
- $(MAKE) -C qt
- $(MAKE) -C designer
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- [ ! -f qt/Makefile ] || $(MAKE) -C qt clean
- [ ! -f designer/Makefile ] || $(MAKE) -C designer clean
- -find -name 'Makefile' -exec rm {} \;
- -rm -rf tmplib
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- install -d $(HEADERDEST)/private
- install -d $(DOCDEST)
- install -d $(TRANSDEST)
- install -d $(LIBSDEST)
- install -d $(PLUGINDEST)
- for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done
- for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done
- for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done
- for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done
- mv designer/*.so $(PLUGINDEST)
- for i in tmplib/*; do mv $$i $(LIBSDEST); done
-
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_install -i --sourcedir=$(CURDIR)/debian/tmp
- dh_installdocs -i
- dh_installchangelogs -i ChangeLog
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_install -a --sourcedir=$(CURDIR)/debian/tmp
- dh_installdocs -a
- dh_installchangelogs -a ChangeLog
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a -V
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules
index 5772f17f6..0db17ad7b 100755
--- a/debian/_base/dependencies/tqtinterface/debian/rules
+++ b/debian/_base/dependencies/tqtinterface/debian/rules
@@ -7,8 +7,15 @@ include debian/cdbs/debian-tde.mk
version=Debian Package $(DEB_VERSION)
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
+ifdef DEB_HOST_MULTIARCH
+ CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+ CMAKE_INSTALL_LIBDIR = lib
+endif
+
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR)
diff --git a/debian/_base/libraries/libkexiv2/debian/docs b/debian/_base/libraries/libkexiv2/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/debian/_base/libraries/libkexiv2/debian/docs
+++ b/debian/_base/libraries/libkexiv2/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
NEWS
-README
+README.md
diff --git a/debian/_base/libraries/libtdeldap/debian/docs b/debian/_base/libraries/libtdeldap/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/libraries/libtdeldap/debian/docs
+++ b/debian/_base/libraries/libtdeldap/debian/docs
@@ -1 +1,2 @@
AUTHORS
+README.md
diff --git a/debian/_base/libraries/libtqt-perl/debian/rules b/debian/_base/libraries/libtqt-perl/debian/rules
index c498ce8ca..85d92e923 100755
--- a/debian/_base/libraries/libtqt-perl/debian/rules
+++ b/debian/_base/libraries/libtqt-perl/debian/rules
@@ -24,7 +24,6 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
--prefix=/opt/trinity \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-qt-dir=/usr/share/tqt3 \
--disable-rpath \
DEB_MAKE_INSTALL_TARGET := install \
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
index c395de89f..62e887ce2 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
@@ -1 +1 @@
-opt/trinity/share/sip/trinity
+opt/trinity/share/sip-tqt/trinity
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
index f7d970bcb..17b8480ab 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
@@ -1,2 +1,2 @@
-sip/* opt/trinity/share/sip/trinity
+sip/* opt/trinity/share/sip-tqt/trinity
contrib/tdepyuic opt/trinity/bin/
diff --git a/debian/_base/libraries/python-trinity/debian/rules b/debian/_base/libraries/python-trinity/debian/rules
index ddbb6b15f..532c74f7f 100755
--- a/debian/_base/libraries/python-trinity/debian/rules
+++ b/debian/_base/libraries/python-trinity/debian/rules
@@ -56,7 +56,7 @@ build-%/configure-stamp:
cd build-$* && python$* ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
- -v /opt/trinity/share/sip/trinity -j $(SPLIT)
+ -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT)
touch $@
dbg-build-%/configure-stamp:
@@ -65,7 +65,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && python$*-dbg ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
- -v /opt/trinity/share/sip/trinity -j $(SPLIT)
+ -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT)
touch $@
build build-arch: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp)
diff --git a/debian/_base/libraries/python-trinity/debian/watch b/debian/_base/libraries/python-trinity/debian/watch
deleted file mode 100644
index 8b3afcac0..000000000
--- a/debian/_base/libraries/python-trinity/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/control b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
index 96e43f1c5..e6b2a0da2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
@@ -206,6 +206,6 @@ Suggests: adept-trinity,
tde-guidance-trinity,
apport-gtk,
hplip-gui
-Conflicts: redmond-default-settings-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: redmond-default-settings-trinity, desktop-base, desktop-base-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop
This package includes artwork and Kubuntu branding.
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm b/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
index 2cbdac854..adada03a7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
@@ -28,6 +28,9 @@ case "$1" in
upgrade)
;;
+ abort-install)
+ ;;
+
*)
echo "Unknown argument ($1) for $0"
;;
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/control b/debian/_base/metapackages/redmond-default-settings/debian/control
index e89dcad2f..363962817 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings/debian/control
@@ -206,6 +206,6 @@ Suggests: adept-trinity,
tde-guidance-trinity,
apport-gtk,
hplip-gui
-Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
Description: Redmond default settings and artwork for the Kubuntu Trinity desktop
This package includes artwork and Kubuntu branding.
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm b/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
index 2cbdac854..adada03a7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
+++ b/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
@@ -28,6 +28,9 @@ case "$1" in
upgrade)
;;
+ abort-install)
+ ;;
+
*)
echo "Unknown argument ($1) for $0"
;;
diff --git a/debian/_base/metapackages/synaptic-trinity/debian/postrm b/debian/_base/metapackages/synaptic-trinity/debian/postrm
index 840ae090e..b06e07e58 100644
--- a/debian/_base/metapackages/synaptic-trinity/debian/postrm
+++ b/debian/_base/metapackages/synaptic-trinity/debian/postrm
@@ -18,6 +18,8 @@ case "$1" in
;;
upgrade)
;;
+ abort-install)
+ ;;
*) echo "$0: didn't understand being called with \`$1'" 1>&2
exit 0;;
esac
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 227c642f2..82edb1404 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -10,15 +10,16 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then
echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME"
else
build_module "$CFG_EXTRA_DEPS_DIR/uncrustify-trinity"
+ #
build_module "$CFG_EXTRA_DEPS_DIR/fireflies"
+ build_module "$CFG_EXTRA_DEPS_DIR/htdig"
build_module "$CFG_EXTRA_DEPS_DIR/imlib"
-# build_module "$CFG_EXTRA_DEPS_DIR/opensync" # deprecated - no longer required in R14.1 series. To remove in R14.2.0
- build_module "$CFG_EXTRA_DEPS_DIR/lcms"
- build_module "$CFG_EXTRA_DEPS_DIR/wv2"
build_module "$CFG_EXTRA_DEPS_DIR/jasper"
- build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg"
+ build_module "$CFG_EXTRA_DEPS_DIR/lcms"
build_module "$CFG_EXTRA_DEPS_DIR/mp4v2"
+ build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg"
build_module "$CFG_EXTRA_DEPS_DIR/transcode"
+ build_module "$CFG_EXTRA_DEPS_DIR/wv2"
fi
set_log_end
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
index 5b30176e2..6c6dc6f25 100644
--- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc
+++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
@@ -45,35 +45,25 @@ BASETGZ="/var/cache/pbuilder/base-$DISTRIBUTION@$ARCHITECTURE.tgz"
#-- select apt components
case "$DISTRIBUTION" in
# debian
- jessie)
- if [[ "$DISTRO" = "devuan" ]]; then
- COMPONENTS="main"
- DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
- EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring"
- else
- COMPONENTS="main contrib non-free"
- fi
- ;;
-
sid|bookwork|bullseye|buster|stretch)
COMPONENTS="main contrib non-free"
;;
# devuan
- ceres|chimaera|beowulf|ascii)
+ ceres|daedalus|chimaera|beowulf|ascii)
COMPONENTS="main"
DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring"
;;
# ubuntu
- impish|hirsute|groovy|focal|bionic|xenial|trusty)
+ jammy|impish|hirsute|groovy|focal|bionic|xenial)
COMPONENTS="main restricted universe multiverse"
DEBOOTSTRAPOPTS=(--variant=buildd)
;;
# raspbian
- raspbian-bullseye|raspbian-buster|raspbian-stretch)
+ raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch)
COMPONENTS="main contrib non-free"
DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
;;
@@ -87,21 +77,13 @@ case "$DISTRIBUTION" in
MIRRORSITE=http://deb.debian.org/debian
;;
- jessie)
- if [[ "$DISTRO" = "devuan" ]]; then
- MIRRORSITE=http://auto.mirror.devuan.org/merged
- else
- MIRRORSITE=http://deb.debian.org/debian
- fi
- ;;
-
# devuan
- ceres|chimaera|beowulf|ascii)
+ ceres|daedalus|chimaera|beowulf|ascii)
MIRRORSITE=http://auto.mirror.devuan.org/merged
;;
# ubuntu
- impish|hirsute|groovy|focal|bionic|xenial|trusty)
+ jammy|impish|hirsute|groovy|focal|bionic|xenial)
if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then
MIRRORSITE=http://archive.ubuntu.com/ubuntu
else
@@ -110,7 +92,7 @@ case "$DISTRIBUTION" in
;;
# raspbian
- raspbian-bullseye|raspbian-buster|raspbian-stretch)
+ raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch)
MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian
;;
esac
@@ -145,14 +127,14 @@ fi
#-- aptitude is better if target distribution contains apt < 1.4~beta3
case "$DISTRIBUTION" in
sid|bookwork|bullseye|buster|stretch|\
- ceres|chimaera|beowulf|ascii|\
- raspbian-bullseye|raspbian-buster|raspbian-stretch|\
- impish|hirsute|groovy|focal|bionic)
+ ceres|daedalus|chimaera|beowulf|ascii|\
+ raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch|\
+ jammy|impish|hirsute|groovy|focal|bionic)
PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
;;
- jessie|\
- xenial|trusty)
+ xenial)
PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-aptitude"
;;
esac
+
diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt
index 54b3446ae..0bcb3fe81 100644
--- a/debian/_buildscripts/local/internals/distro_list.txt
+++ b/debian/_buildscripts/local/internals/distro_list.txt
@@ -10,7 +10,6 @@
#
# debian
-debian 8.0 jessie - -
debian 9.0 stretch - -
debian 10.0 buster - -
debian 11.0 bullseye - -
@@ -20,8 +19,9 @@ debian 13.0 sid ~b -
# devuan
devuan 2.0 ascii - debian/stretch
devuan 3.0 beowulf - debian/buster
-devuan 4.0 chimaera ~a debian/bullseye
-devuan 5.0 ceres ~b debian/sid
+devuan 4.0 chimaera - debian/bullseye
+devuan 5.0 daedalus ~a debian/bookwork
+devuan 6.0 ceres ~b debian/sid
# raspbian
raspbian 9.0 raspbian-stretch - -
@@ -30,10 +30,10 @@ raspbian 11.0 raspbian-bullseye - -
raspbian 12.0 raspbian-bookworm ~a -
# ubuntu
-ubuntu 14.04 trusty - -
ubuntu 16.04 xenial - -
ubuntu 18.04 bionic - -
ubuntu 20.04 focal - -
ubuntu 20.10 groovy - -
ubuntu 21.04 hirsute - -
-ubuntu 21.10 impish ~a -
+ubuntu 21.10 impish - -
+ubuntu 22.04 jammy ~a -
diff --git a/dilos/common/cmake/debian/control b/dilos/common/cmake/debian/control
index 1363e01ee..50ea830ef 100644
--- a/dilos/common/cmake/debian/control
+++ b/dilos/common/cmake/debian/control
@@ -2,7 +2,7 @@ Source: cmake-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
Standards-Version: 3.8.4
Package: cmake-trinity
diff --git a/dilos/core/tdebase/debian/control b/dilos/core/tdebase/debian/control
index a48094d6b..565009121 100644
--- a/dilos/core/tdebase/debian/control
+++ b/dilos/core/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
Architecture: all
Replaces: kdebase-trinity (<< 4:14.0.0~)
Breaks: kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${source:Version})
Description: base components from the official TDE release
diff --git a/dilos/core/tdebindings/debian/control b/dilos/core/tdebindings/debian/control
index 99fbd2427..c9b846391 100644
--- a/dilos/core/tdebindings/debian/control
+++ b/dilos/core/tdebindings/debian/control
@@ -1,7 +1,7 @@
Source: tdebindings-trinity
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
- default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc],
+ default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev,
graphviz [solaris-any], libgtk2.0-dev [solaris-any], oracle-java8-jdk [solaris-any]
diff --git a/dilos/core/tdegraphics/debian/rules b/dilos/core/tdegraphics/debian/rules
index 316afdc09..2b82437ac 100755
--- a/dilos/core/tdegraphics/debian/rules
+++ b/dilos/core/tdegraphics/debian/rules
@@ -25,9 +25,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_ALL="ON" \
- -DWITH_TIFF="ON" \
- -DWITH_OPENEXR="ON" \
- -DWITH_PDF="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
-DCMAKE_C_COMPILER=gcc \
-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
diff --git a/dilos/core/tdetoys/debian/kweather-trinity.install b/dilos/core/tdetoys/debian/kweather-trinity.install
index 3dfc38fc9..99f933e21 100644
--- a/dilos/core/tdetoys/debian/kweather-trinity.install
+++ b/dilos/core/tdetoys/debian/kweather-trinity.install
@@ -2,10 +2,12 @@ debian/tmp/usr/bin/kweatherservice
debian/tmp/usr/bin/kweatherreport
debian/tmp/usr/lib/*/libtdeinit_kweatherreport.so
debian/tmp/usr/lib/*/libtdeinit_kweatherreport.la
-debian/tmp/usr/lib/*/trinity/kcm_weather.so
-debian/tmp/usr/lib/*/trinity/kcm_weather.la
+debian/tmp/usr/lib/*/trinity/kcm_weatherapplet.so
+debian/tmp/usr/lib/*/trinity/kcm_weatherapplet.la
debian/tmp/usr/lib/*/trinity/kcm_weatherservice.so
debian/tmp/usr/lib/*/trinity/kcm_weatherservice.la
+debian/tmp/usr/lib/*/trinity/kcm_weatherstations.so
+debian/tmp/usr/lib/*/trinity/kcm_weatherstations.la
debian/tmp/usr/lib/*/trinity/kweatherreport.so
debian/tmp/usr/lib/*/trinity/kweatherreport.la
debian/tmp/usr/lib/*/trinity/weather_panelapplet.la
@@ -27,5 +29,6 @@ debian/tmp/usr/share/icons/hicolor/48x48/apps/kweather.png
debian/tmp/usr/share/man/man1/kweatherreport.1
debian/tmp/usr/share/man/man1/kweatherservice.1
debian/tmp/usr/share/services/kweatherservice.desktop
-debian/tmp/usr/share/services/kcmweather.desktop
+debian/tmp/usr/share/services/kcmweatherapplet.desktop
debian/tmp/usr/share/services/kcmweatherservice.desktop
+debian/tmp/usr/share/services/kcmweatherstations.desktop
diff --git a/dilos/dependencies/python-tqt/debian/rules b/dilos/dependencies/python-tqt/debian/rules
index 0056ca307..7c6c39af2 100755
--- a/dilos/dependencies/python-tqt/debian/rules
+++ b/dilos/dependencies/python-tqt/debian/rules
@@ -61,7 +61,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* && echo yes \
| python$* ../configure.py \
- -c -n /usr/include/tqscintilla \
+ -c -n /usr/include/tqt3 \
-e python$* \
-o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
@@ -76,9 +76,9 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
- -c -n /usr/include/tqscintilla \
+ -c -n /usr/include/tqt3 \
-e python$* \
- -o /usr/lib -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \
-v /usr/share/sip/tqt \
diff --git a/dilos/dependencies/sip4-tqt/debian/control b/dilos/dependencies/sip4-tqt/debian/control
index cdb796e02..062fca734 100644
--- a/dilos/dependencies/sip4-tqt/debian/control
+++ b/dilos/dependencies/sip4-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev, bison, flex
Standards-Version: 3.8.4
XS-Python-Version: all
@@ -67,4 +67,3 @@ Description: Python/C++ bindings generator development files
.
This package contains the code generator tool and the development headers
needed to develop Python bindings with sip.
-
diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/sip.1 b/dilos/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
index ce178cc7e..ef824974f 100644
--- a/dilos/dependencies/sip4-tqt/debian/manpages/sip.1
+++ b/dilos/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
@@ -1,26 +1,26 @@
.\"
.\" Created by Ricardo Crdenes Medina <ricardo@conysis.com>
-.\" for the Debian 'sip' package
+.\" for the Debian 'sip-tqt' package
.\"
-.TH SIP 1 "2010/02/02"
+.TH SIP-TQT 1 "2010/02/02"
.SH NAME
-sip \- generates C++/Python bindings
+sip-tqt \- generates C++/Python bindings
.SH SYNOPSIS
-.B sip
+.B sip-tqt
[\fI-h\fR] [\fI-V\fR] [\fI-a file\fR] [\fI-c dir\fR] [\fI-d file\fR] [\fI-e\fR] [\fI-g\fR] [\fI-I dir\fR] [\fI-j #\fR] [\fI-k\fR] [\fI-m file\fR] [\fI-o\fR] [\fI-p module\fR] [\fI-P\fR] [\fI-r\fR] [\fI-s suffix\fR] [\fI-t tag\fR] [\fI-w\fR] [\fI-x feature\fR] [\fI-z file\fR] [\fIfile\fR]
.SH DESCRIPTION
-.B sip
+.B sip-tqt
takes a set of specification files and generates C++ code, documentation and build files.
The format of the needed specification file is similar to a C++ header.
-sip includes run-time support for the generated code.
+sip-tqt includes run-time support for the generated code.
.SH OPTIONS
.TP
.B \-h
Show summary of options.
.TP
.B \-V
-Display the sip version number
+Display the sip-tqt version number
.TP
.B \-a file
The name of the QScintilla API file. If not indicated, it will not
@@ -43,7 +43,7 @@ Enable support for exceptions. Disabled by default.
Always release and reaquire the GIL.
.TP
.B -I dir
-Directory where sip can search for included files.
+Directory where sip-tqt can search for included files.
.TP
.B -j number
Splits the generated code in \fInumber\fR files (1 by default). This
@@ -66,7 +66,7 @@ The suffix used for generated C or C++ files (".c" or ".cpp" if none specified)
.TP
.B -t tag
The primary version to tag generate code for. You only can specify those
-defined with a %Timeline directive. If you don't specify one, sip
+defined with a %Timeline directive. If you don't specify one, sip-tqt
will generate the latest available.
.TP
.B -w
@@ -80,7 +80,7 @@ The name of a file containing additional command line flags
.TP
.B file
The name of the file containing the specification. If you skip it,
-sip will expect to be fed by stdin.
+sip-tqt will expect to be fed by stdin.
.SH AUTHOR
This manual page was written by Ricardo Javier Cardenes Medina <rcardenes@debian.org> and Torsten Marek <shlomme@debian.org>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
index ba33bb512..b3b0eafea 100644
--- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
@@ -1,2 +1,2 @@
-debian/manpages/sip.1
+debian/manpages/sip-tqt.1
debian/manpages/dh_sip_tqt.1
diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..bfa1b37f6 100644
--- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python*/*-packages/sip_tqt.so
diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules
index 9fd544a5a..23fe587f0 100755
--- a/dilos/dependencies/sip4-tqt/debian/rules
+++ b/dilos/dependencies/sip4-tqt/debian/rules
@@ -48,7 +48,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* \
&& python$* ../configure.py \
- -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
-g python$* \
-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" \
-p solaris-g++
@@ -59,7 +59,7 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* \
&& python$*-dbg ../configure.py \
- -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
-g python$* \
-e /usr/include/python$*_d \
-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
@@ -114,18 +114,17 @@ install-arch: build
install-arch-%:
$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
# $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg
- mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
- touch debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/__init__.py
- install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
- install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py
-# install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
+ mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/
+ install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
+ install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
+# install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
- install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/
+ install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev/usr/include/python$*/
mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
- ln -s ../python$*/sip.h \
- debian/python-sip-tqt-dev/usr/include/python$*_d/sip.h
- mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
- install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
+ ln -s ../python$*/sip-tqt.h \
+ debian/python-sip-tqt-dev/usr/include/python$*_d/sip-tqt.h
+ mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
+ install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
# Must not depend on anything. This is to be called by
diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py
new file mode 100644
index 000000000..33ebcb65b
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py
@@ -0,0 +1,13 @@
+# import the sip_tqt_config.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+ try:
+ from sip_tqt_config_d import *
+ from sip_tqt_config_d import _pkg_config, _default_macros
+ except ImportError, msg:
+ raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed'
+else:
+ from sip_tqt_config_nd import *
+ from sip_tqt_config_nd import _pkg_config, _default_macros
diff --git a/dilos/dependencies/sip4-tqt/debian/sipconfig.py b/dilos/dependencies/sip4-tqt/debian/sipconfig.py
deleted file mode 100644
index a9e761f08..000000000
--- a/dilos/dependencies/sip4-tqt/debian/sipconfig.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# import the sipconfig.py for the normal or the debug build
-
-import sys
-
-if getattr(sys, "pydebug", False):
- try:
- from sipconfig_d import *
- from sipconfig_d import _pkg_config, _default_macros
- except ImportError, msg:
- raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed'
-else:
- from sipconfig_nd import *
- from sipconfig_nd import _pkg_config, _default_macros
diff --git a/dilos/dependencies/sip4-tqt/debian/watch b/dilos/dependencies/sip4-tqt/debian/watch
deleted file mode 100644
index 1ff1f0839..000000000
--- a/dilos/dependencies/sip4-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.co.uk/software/sip/download \
- /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate
diff --git a/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl b/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/dilos/dependencies/tqscintilla/debian/control b/dilos/dependencies/tqscintilla/debian/control
index adf09130c..9d4458b48 100644
--- a/dilos/dependencies/tqscintilla/debian/control
+++ b/dilos/dependencies/tqscintilla/debian/control
@@ -3,15 +3,17 @@ Section: libs
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: debhelper (>= 9~), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
Standards-Version: 3.8.4
Package: libtqscintilla7
Section: libs
Architecture: any
+Multi-Arch: same
Replaces: libtqscintilla7 (<< 4:14.0.0~)
Breaks: libtqscintilla7 (<< 4:14.0.0~)
Depends: ${shlibs:Depends}
+Recommends: libtqscintilla7-i18n
Description: TQt source code editing component based on Scintilla
Scintilla is a free source code editing component. It has features found
in standard editing components, as well as features especially useful
@@ -19,9 +21,23 @@ Description: TQt source code editing component based on Scintilla
.
TQScintilla is a port or Scintilla to the TQt GUI toolkit.
+Package: libtqscintilla7-i18n
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Replaces: libtqscintilla7 (<< 4:14.0.12~)
+Breaks: libtqscintilla7 (<< 4:14.0.12~)
+Description: i18n files for TQScintilla library
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ This package contains the internationalization files for the TQScintilla library.
+
Package: libtqscintilla-dev
Section: libdevel
Architecture: any
+Multi-Arch: foreign
Replaces: libtqscintilla-dev (<< 4:14.0.0~)
Breaks: libtqscintilla-dev (<< 4:14.0.0~)
Depends: libtqscintilla7 (>= ${source:Version})
@@ -36,6 +52,7 @@ Description: TQt source code editing component - development files
Package: libtqscintilla-doc
Section: doc
Architecture: all
+Multi-Arch: foreign
Replaces: libtqscintilla-doc (<< 4:14.0.0~)
Breaks: libtqscintilla-doc (<< 4:14.0.0~)
Suggests: libtqscintilla-dev
diff --git a/dilos/dependencies/tqscintilla/debian/dirs b/dilos/dependencies/tqscintilla/debian/dirs
deleted file mode 100644
index ca882bbb7..000000000
--- a/dilos/dependencies/tqscintilla/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/dilos/dependencies/tqscintilla/debian/docs b/dilos/dependencies/tqscintilla/debian/docs
index edc007104..50bd824bb 100644
--- a/dilos/dependencies/tqscintilla/debian/docs
+++ b/dilos/dependencies/tqscintilla/debian/docs
@@ -1 +1,2 @@
NEWS
+README
diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install
index 146a60371..8a9449faa 100644
--- a/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install
+++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install
@@ -1,2 +1,3 @@
usr/include
-usr/lib/*/*.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so
diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 005276324..d66379c9a 100644
--- a/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -1 +1 @@
-usr/share/doc/libtqscintilla-doc
+usr/share/doc/libtqscintilla/HTML
diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
new file mode 100644
index 000000000..8fc621fc3
--- /dev/null
+++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
@@ -0,0 +1 @@
+usr/share/tqt3/translations/*.qm
diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install
index 7b76fb1f7..b3c140659 100644
--- a/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -1,3 +1,2 @@
-usr/lib/*/*.so.*
-usr/lib/*/tqt3/plugins/designer/*.so
-usr/share/tqt3/translations/*.qm
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*.so
diff --git a/dilos/dependencies/tqscintilla/debian/rules b/dilos/dependencies/tqscintilla/debian/rules
index 14545306f..bcf875516 100755
--- a/dilos/dependencies/tqscintilla/debian/rules
+++ b/dilos/dependencies/tqscintilla/debian/rules
@@ -1,119 +1,20 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
+ifdef DEB_HOST_MULTIARCH
+ CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+ CMAKE_INSTALL_LIBDIR = lib
endif
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-# This is the debhelper compatibility version to use.
-export TQTDIR=/usr/share/tqt3
-export QMAKESPEC=$(TQTDIR)/mkspecs/dilos-g++
-DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html
-HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla
-LIBSDEST=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-TRANSDEST=$(CURDIR)/debian/tmp/$(TQTDIR)/translations
-PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- cd qt; qmake "DESTDIR=$(CURDIR)/tmplib"
- cd designer; qmake
- touch configure-stamp
-
-build build-arch: build-stamp
-build-indep:
-
-build-stamp: configure-stamp
- dh_testdir
-
- install -d $(CURDIR)/tmplib
- $(MAKE) -C qt
- $(MAKE) -C designer
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- [ ! -f qt/Makefile ] || $(MAKE) -C qt clean
- [ ! -f designer/Makefile ] || $(MAKE) -C designer clean
- -find -name 'Makefile' -exec rm {} \;
- -rm -rf tmplib
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- install -d $(HEADERDEST)/private
- install -d $(DOCDEST)
- install -d $(TRANSDEST)
- install -d $(LIBSDEST)
- install -d $(PLUGINDEST)
- for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done
- for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done
- for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done
- for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done
- mv designer/*.so $(PLUGINDEST)
- for i in tmplib/*; do mv $$i $(LIBSDEST); done
-
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_install -i --sourcedir=$(CURDIR)/debian/tmp
- dh_installdocs -i
- dh_installchangelogs -i ChangeLog
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_install -a --sourcedir=$(CURDIR)/debian/tmp
- dh_installdocs -a
- dh_installchangelogs -a ChangeLog
- dh_link -a
- dh_strip -a --ctfconvert-flags="-i" -Xlibqscintilla.so.7.0.1 -Xlibqscintillaplugin.so
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a -V
- dh_installdeb -a
- dh_shlibdeps -a --dpkg-shlibdeps-params=--ignore-missing-info
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/gentoo b/gentoo
-Subproject 8762be5f6115dbc31db0f119a31762d6deecf84
+Subproject ed450c598cae712a269bea03a451cf22363b468
diff --git a/raspbian/raspbian-bookworm b/raspbian/raspbian-bookworm
new file mode 120000
index 000000000..99541159c
--- /dev/null
+++ b/raspbian/raspbian-bookworm
@@ -0,0 +1 @@
+../debian/bookworm \ No newline at end of file
diff --git a/raspbian/raspbian-stretch b/raspbian/raspbian-stretch
new file mode 120000
index 000000000..5d50285db
--- /dev/null
+++ b/raspbian/raspbian-stretch
@@ -0,0 +1 @@
+../debian/stretch \ No newline at end of file
diff --git a/redhat/Makefile b/redhat/Makefile
index be407f043..6598c60ad 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -27,7 +27,7 @@ all: dependencies main libraries applications i18n meta
dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-suse2 wlassistant yakuake
+applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-suse2 wlassistant yakuake
i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
@@ -114,7 +114,7 @@ tdenetwork: tdebase rdesktop
tdepim: tdebase libcaldav libcarddav
$(call buildpkg,main/tdepim)
-tdesdk: tdebase tdebindings
+tdesdk: tdebase tdebindings tdepim
$(call buildpkg,main/tdesdk)
tdetoys: tdebase
@@ -181,7 +181,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
endif
wv2:
-ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34))
+ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35))
$(call buildpkg,3rdparty/wv2)
endif
@@ -426,7 +426,7 @@ kpicosim: tdebase
$(call buildpkg,applications/kpicosim)
kpilot: tdebase tdepim
-ifeq (,$(filter $(DIST),.el5))
+ifeq (,$(filter $(DIST),.el5 .osstw))
$(call buildpkg,applications/kpilot)
endif
@@ -561,6 +561,9 @@ endif
tderadio: tdebase
$(call buildpkg,applications/tderadio)
+tdesshaskpass: tdebase
+ $(call buildpkg,applications/tdesshaskpass)
+
tde-style-baghira: tdebase
$(call buildpkg,applications/tde-style-baghira)
@@ -597,6 +600,9 @@ tork: tdebase
twin-style-crystal: tdebase
$(call buildpkg,applications/twin-style-crystal)
+twin-style-dekorator: tdebase
+ $(call buildpkg,applications/twin-style-dekorator)
+
twin-style-suse2: tdebase
$(call buildpkg,applications/twin-style-suse2)
@@ -641,7 +647,7 @@ git:
cd "$(TDE_GIT_DIR)" && ./scripts/switch_all_submodules_to_head_and_clean anonymous
tarballs:
- cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 ./scripts/create_all_tarballs
+ cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 TARBALLS_BASE="${HOME}/tde/tarballs/${TDE_VERSION}" ./scripts/create_all_tarballs
# External packages
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec
index 52085c0c0..1a66c3a57 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -279,7 +279,7 @@ Amarok is a multimedia player with:
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
+%doc COPYING AUTHORS ChangeLog README.md
%{tde_bindir}/amarok
%{tde_bindir}/amarokapp
%{tde_bindir}/amarokcollectionscanner
diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/codeine/codeine.spec
index 273d8e5e7..9daa6e5b6 100644
--- a/redhat/applications/codeine/codeine.spec
+++ b/redhat/applications/codeine/codeine.spec
@@ -152,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc COPYING FAQ README TODO
+%doc COPYING FAQ README.md TODO
%{tde_bindir}/codeine
%{tde_tdeappdir}/codeine.desktop
%{tde_datadir}/apps/codeine/
diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/k3b/k3b.spec
index 216bebdf9..92c41d4f6 100644
--- a/redhat/applications/k3b/k3b.spec
+++ b/redhat/applications/k3b/k3b.spec
@@ -422,6 +422,10 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+%if 0%{?rhel} == 7
+RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11"
+%endif
+
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
index 775501caa..e336136d6 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -59,7 +59,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -98,33 +98,46 @@ when a page containing a supported media format is loaded.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-%configure \
- --prefix=%{_libdir}/mozilla \
+if [ -d "%{_includedir}/nspr4" ]; then
+ RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}"
+fi
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
# Remove useless filess
%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
@@ -136,7 +149,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING
# These files are installed outside TDE prefix
%dir %{_libdir}/mozilla
%dir %{_libdir}/mozilla/plugins
diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/kaffeine/kaffeine.spec
index ecc2cfd85..148234adb 100644
--- a/redhat/applications/kaffeine/kaffeine.spec
+++ b/redhat/applications/kaffeine/kaffeine.spec
@@ -217,7 +217,7 @@ Konqueror plugin, OSD and much more.
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
%{tde_bindir}/kaffeine
%{tde_libdir}/libkaffeinepart.so
%{tde_tdelibdir}/lib*.*
diff --git a/redhat/applications/kasablanca/kasablanca.spec b/redhat/applications/kasablanca/kasablanca.spec
index 3185b4c15..651e6575d 100644
--- a/redhat/applications/kasablanca/kasablanca.spec
+++ b/redhat/applications/kasablanca/kasablanca.spec
@@ -177,7 +177,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
%{tde_bindir}/kasablanca
%{tde_datadir}/apps/kasablanca/
%{tde_datadir}/config.kcfg/kbconfig.kcfg
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec
index 76d62aaf5..1bb5c7259 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/kbibtex/kbibtex.spec
@@ -162,7 +162,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TODO ChangeLog
+%doc AUTHORS COPYING NEWS README.md TODO ChangeLog
%{tde_bindir}/kbibtex
%{tde_tdelibdir}/libkbibtexpart.la
%{tde_tdelibdir}/libkbibtexpart.so
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec
index cf2381a2e..b5cab1e88 100644
--- a/redhat/applications/kbiff/kbiff.spec
+++ b/redhat/applications/kbiff/kbiff.spec
@@ -160,7 +160,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
%{tde_bindir}/kbiff
%{tde_libdir}/libtdeinit_kbiff.la
%{tde_libdir}/libtdeinit_kbiff.so
diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/kchmviewer/kchmviewer.spec
index 6b313a27c..78dc56d18 100644
--- a/redhat/applications/kchmviewer/kchmviewer.spec
+++ b/redhat/applications/kchmviewer/kchmviewer.spec
@@ -192,7 +192,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc ChangeLog COPYING FAQ README
+%doc ChangeLog COPYING FAQ README.md
%{tde_bindir}/kchmviewer
%{tde_tdelibdir}/tdeio_msits.la
%{tde_tdelibdir}/tdeio_msits.so
diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/kcmautostart/kcmautostart.spec
index 8d9a9aa3f..fde0f224b 100644
--- a/redhat/applications/kcmautostart/kcmautostart.spec
+++ b/redhat/applications/kcmautostart/kcmautostart.spec
@@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f autostart.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README
+%doc AUTHORS ChangeLog COPYING INSTALL README.md
%{tde_tdelibdir}/kcm_autostart.la
%{tde_tdelibdir}/kcm_autostart.so
%{tde_tdeappdir}/autostart.desktop
diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec
index 07c03d26e..ed5940cbd 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber.spec
+++ b/redhat/applications/kftpgrabber/kftpgrabber.spec
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -124,38 +124,40 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTDIR
export PATH="%{tde_bindir}:${PATH}"
-# Warning: --enable-final causes FTBFS
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --disable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
%install
%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
%find_lang %{tde_pkg}
@@ -188,6 +190,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/services/kftpimportplugin_ncftp.desktop
%{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop
%{tde_tdedocdir}/HTML/en/kftpgrabber/
+%{tde_mandir}/man1/kftpgrabber.1*
%files devel
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
index 4120e4b9d..3a30a8783 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
@@ -174,7 +174,7 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
%files -f kgtk.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
%{tde_bindir}/kdialogd-wrapper
%{tde_bindir}/kdialogd3
%{tde_bindir}/kgtk-wrapper
diff --git a/redhat/applications/kima/kima.spec b/redhat/applications/kima/kima.spec
index 4d6efa03e..ce1c911a6 100644
--- a/redhat/applications/kima/kima.spec
+++ b/redhat/applications/kima/kima.spec
@@ -162,7 +162,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
%{tde_tdelibdir}/libkima.la
%{tde_tdelibdir}/libkima.so
%{tde_datadir}/apps/kicker/applets/kima.desktop
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec
index 1cbea5c09..bc42e6a3c 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/kiosktool/kiosktool.spec
@@ -167,7 +167,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
+%doc ChangeLog COPYING README.md TODO
%{tde_bindir}/kiosktool
%{tde_bindir}/kiosktool-tdedirs
%{tde_tdeappdir}/kiosktool.desktop
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec
index 33377275b..80857d027 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/kkbswitch/kkbswitch.spec
@@ -174,7 +174,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog README.md TODO
%{tde_bindir}/kkbswitch
%{tde_tdeappdir}/kkbswitch.desktop
%{tde_datadir}/apps/kkbswitch/
diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/klamav/klamav.spec
index edc1de0f6..2520086ff 100644
--- a/redhat/applications/klamav/klamav.spec
+++ b/redhat/applications/klamav/klamav.spec
@@ -40,7 +40,12 @@ Summary: Frontend for clamav
Version: 0.46
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-License: GPLv2+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
Group: Applications/Utilities
Vendor: Trinity Project
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec
index cee0f837f..82128c225 100644
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/klcddimmer/klcddimmer.spec
@@ -147,7 +147,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE NEWS README
+%doc AUTHORS COPYING LICENSE NEWS README.md
%{tde_libdir}/klcddimmer_panelapplet.la
%{tde_libdir}/klcddimmer_panelapplet.so
%{tde_datadir}/apps/kicker/applets/klcddimmer.desktop
diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/kmplayer/kmplayer.spec
index b7d0b5e80..675d8406b 100644
--- a/redhat/applications/kmplayer/kmplayer.spec
+++ b/redhat/applications/kmplayer/kmplayer.spec
@@ -170,7 +170,7 @@ KMPlayer can:
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO
+%doc AUTHORS COPYING ChangeLog INSTALL README.md TODO
%{tde_bindir}/kmplayer
%{tde_bindir}/knpplayer
%{tde_bindir}/kxvplayer
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec
index d93d68d2b..bfebfa365 100644
--- a/redhat/applications/knmap/knmap.spec
+++ b/redhat/applications/knmap/knmap.spec
@@ -177,7 +177,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
%{tde_bindir}/knmap
%{tde_tdeappdir}/knmap.desktop
%{tde_datadir}/apps/knmap/
diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec
index aa8f2eb91..9bc84ad01 100644
--- a/redhat/applications/knutclient/knutclient.spec
+++ b/redhat/applications/knutclient/knutclient.spec
@@ -106,7 +106,7 @@ stations using an UPS.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Fix permissions
-chmod 644 AUTHORS README COPYING ChangeLog
+chmod 644 AUTHORS README.md COPYING ChangeLog
%build
@@ -167,7 +167,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
%{tde_bindir}/knutclient
%{tde_tdeappdir}/knutclient.desktop
%{tde_datadir}/apps/knutclient/knutclientui.rc
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
index b3c4c2da2..81bf68605 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -216,7 +216,7 @@ BuildRequires: trinity-poppler-devel >= 0.12
# POSTGRESQL support
# Requires 'libpqxx', for kexi-driver-pgqsl
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550
+%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0
%define with_postgresql 1
BuildRequires: postgresql-devel
BuildRequires: libpqxx-devel
diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec
index 0b175326b..c3863834e 100644
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ b/redhat/applications/kpicosim/kpicosim.spec
@@ -159,7 +159,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
%{tde_bindir}/kpicosim
%{tde_tdeappdir}/kpicosim.desktop
%{tde_datadir}/apps/katepart/syntax/psm.xml
diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/kpowersave/kpowersave.spec
index 3046fedf4..cba094deb 100644
--- a/redhat/applications/kpowersave/kpowersave.spec
+++ b/redhat/applications/kpowersave/kpowersave.spec
@@ -193,7 +193,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README.md TODO
%{tde_bindir}/kpowersave
%{tde_libdir}/libtdeinit_kpowersave.la
%{tde_libdir}/libtdeinit_kpowersave.so
diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/kscope/kscope.spec
index 0df980cff..495f8940a 100644
--- a/redhat/applications/kscope/kscope.spec
+++ b/redhat/applications/kscope/kscope.spec
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
Requires: cscope
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -123,45 +123,47 @@ Main Features:
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
%install
%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
%find_lang %{tde_pkg}
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file %{tde_pkg} Development IDE
@@ -174,13 +176,14 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
%{tde_bindir}/kscope
%{tde_tdeappdir}/kscope.desktop
%{tde_datadir}/apps/kscope/
%{tde_tdedocdir}/HTML/en/kscope/
%{tde_datadir}/icons/hicolor/*/apps/kscope.png
%{tde_datadir}/icons/locolor/*/apps/kscope.png
+%{tde_mandir}/man1/kscope.1*
%changelog
diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec
index 1e0d080d6..eb325aec0 100644
--- a/redhat/applications/ksensors/ksensors.spec
+++ b/redhat/applications/ksensors/ksensors.spec
@@ -163,7 +163,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ README TODO
+%doc AUTHORS ChangeLog COPYING FAQ README.md TODO
%{tde_bindir}/ksensors
%{tde_tdeappdir}/ksensors.desktop
%{tde_datadir}/apps/ksensors/
diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/kshowmail/kshowmail.spec
index c9550e8cc..8d445fe97 100644
--- a/redhat/applications/kshowmail/kshowmail.spec
+++ b/redhat/applications/kshowmail/kshowmail.spec
@@ -160,7 +160,7 @@ install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
%{tde_bindir}/kshowmail
%{tde_tdelibdir}/kcm_kshowmailconfigaccounts.la
%{tde_tdelibdir}/kcm_kshowmailconfigaccounts.so
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec
index 53ec37121..f965f79f5 100644
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ b/redhat/applications/kshutdown/kshutdown.spec
@@ -163,7 +163,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
%{tde_bindir}/kshutdown
%{tde_tdelibdir}/kshutdownlockout_panelapplet.la
%{tde_tdelibdir}/kshutdownlockout_panelapplet.so
diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/ksystemlog/ksystemlog.spec
index 38f6d8f7b..eb8bc66e0 100644
--- a/redhat/applications/ksystemlog/ksystemlog.spec
+++ b/redhat/applications/ksystemlog/ksystemlog.spec
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -97,39 +97,45 @@ quickly see problems occuring on their server.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
# Missing category will make this fail.
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
@@ -143,7 +149,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS COPYING README.md
%{tde_bindir}/ksystemlog
%{tde_tdeappdir}/ksystemlog.desktop
%{tde_datadir}/apps/ksystemlog/
@@ -151,5 +157,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
%{tde_tdedocdir}/HTML/en/ksystemlog/
+%{tde_mandir}/man1/ksystemlog.1*
+
%changelog
diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/kvkbd/kvkbd.spec
index fcc0a8dda..1bf56e90d 100644
--- a/redhat/applications/kvkbd/kvkbd.spec
+++ b/redhat/applications/kvkbd/kvkbd.spec
@@ -157,7 +157,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
%{tde_bindir}/kvkbd
%{tde_tdeappdir}/kvkbd.desktop
%{tde_datadir}/apps/kvkbd/
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec
index ca2bd8d39..242b37b37 100644
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ b/redhat/applications/kvpnc/kvpnc.spec
@@ -159,7 +159,7 @@ export PATH="%{_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
%{tde_bindir}/kvpnc
%{tde_tdeappdir}/kvpnc.desktop
%{tde_datadir}/apps/kvpnc/
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec
index 21ca470e2..1c34074cb 100644
--- a/redhat/applications/mathemagics/mathemagics.spec
+++ b/redhat/applications/mathemagics/mathemagics.spec
@@ -116,10 +116,10 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
%{tde_bindir}/mathemagics
%{tde_tdeappdir}/mathemagics.desktop
-%{tde_datadir}/apps/mathemagics/mathemagicsui.rc
+%{tde_datadir}/apps/mathemagics/
%{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png
%{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png
%{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/mplayerthumbs/mplayerthumbs.spec
index b565d8602..e917cc0a7 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/mplayerthumbs/mplayerthumbs.spec
@@ -147,23 +147,23 @@ fi
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=%{buildroot} -C build
-%find_lang %{tde_pkg}
-
%clean
%__rm -rf $RPM_BUILD_ROOT
-%files -f %{tde_pkg}.lang
+%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/mplayerthumbsconfig
-%{tde_tdelibdir}/videopreview.la
-%{tde_tdelibdir}/videopreview.so
-%{tde_datadir}/apps/videopreview/
-%{tde_datadir}/config.kcfg/mplayerthumbs.kcfg
-%{tde_datadir}/services/videopreview.desktop
-%{tde_tdedocdir}/HTML/en/videopreview/
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/mplayer-thumbnailer-config
+%{tde_tdelibdir}/mplayer-thumbnailer.la
+%{tde_tdelibdir}/mplayer-thumbnailer.so
+%{tde_datadir}/apps/mplayer-thumbnailer/
+%{tde_datadir}/apps/tdeconf_update/mplayer-thumbnailer-cfg-rename.upd
+%{tde_datadir}/config.kcfg/mplayer-thumbnailer.kcfg
+%{tde_datadir}/services/mplayer-thumbnailer.desktop
+%{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo
%changelog
diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/potracegui/potracegui.spec
index e48acc481..38650b218 100644
--- a/redhat/applications/potracegui/potracegui.spec
+++ b/redhat/applications/potracegui/potracegui.spec
@@ -158,7 +158,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
%{tde_bindir}/potracegui
%{tde_tdeappdir}/potracegui.desktop
%{tde_datadir}/apps/potracegui/
diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
new file mode 100644
index 000000000..721377ca1
--- /dev/null
+++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
@@ -0,0 +1,159 @@
+#
+# spec file for package tdesshaskpass (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.10
+%endif
+%define tde_pkg tdesshaskpass
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.4.1
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: interactively prompt users for a passphrase for ssh-add
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+%if 0%{?sle_version} >= 150200
+Requires: openssh
+%else
+Requires: openssh-clients
+%endif
+
+%description
+A TDE version of ssh-askpass with TDEWallet support.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README.md
+%{tde_bindir}/*
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec
index 6a4c5c7f3..204b2c444 100644
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec
@@ -143,6 +143,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdelibdir}/twin_baghira_config.so
%{tde_libdir}/usermanager_panelapplet.la
%{tde_libdir}/usermanager_panelapplet.so
+%{tde_tdeappdir}/bab.desktop
%{tde_datadir}/apps/baghira/
%{tde_datadir}/apps/kicker/applets/baghira-starter.desktop
%{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
index 74527fb76..64315ad92 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
@@ -69,7 +69,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -102,42 +102,46 @@ Control Centre with an improved user interface.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --sysconfdir=%{tde_sysconfdir} \
- --mandir=%{tde_mandir} \
- --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory
@@ -168,7 +172,7 @@ done
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc README TODO
+%doc README.md TODO
%dir %{tde_sysconfdir}/xdg
%dir %{tde_sysconfdir}/xdg/menus
%dir %{tde_sysconfdir}/xdg/menus/applications-merged
@@ -184,7 +188,7 @@ done
%config(noreplace) %{tde_confdir}/systemsettingsrc
%{tde_datadir}/desktop-directories/*.directory
%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-%{tde_tdedocdir}/HTML/en/systemsettings/
+%{tde_tdedocdir}/HTML/en/tde-systemsettings/
%{tde_mandir}/man1/systemsettings.1*
%changelog
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec
index 640bc8809..e793248f2 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec
+++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec
@@ -154,7 +154,7 @@ fi
%files -f tdeio_ftps.lang
%defattr(-,root,root,-)
%defattr(-,root,root,-)
-%doc README Changelog COPYING AUTHORS
+%doc README.md Changelog COPYING AUTHORS
%{tde_tdelibdir}/tdeio_ftps.la
%{tde_tdelibdir}/tdeio_ftps.so
%{tde_datadir}/services/ftps.protocol
diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec
index 2846be7dd..f78299a70 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword.spec
+++ b/redhat/applications/tdeio-sword/tdeio-sword.spec
@@ -163,7 +163,7 @@ fi
%files -f tdeio_sword.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
%{tde_tdelibdir}/tdeio_sword.la
%{tde_tdelibdir}/tdeio_sword.so
%{tde_datadir}/apps/tdeio_sword/
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
index 149e5a882..5507745c2 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
@@ -179,7 +179,7 @@ fi
%files -f tdeio_umountwrapper.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
%{tde_bindir}/tdeio_umountwrapper
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
%dir %{tde_datadir}/apps/d3lphin
diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec
index fc7c580e1..ac0841d2d 100644
--- a/redhat/applications/tdepacman/tdepacman.spec
+++ b/redhat/applications/tdepacman/tdepacman.spec
@@ -131,7 +131,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
%{tde_bindir}/tdepacman
%{tde_tdeappdir}/tdepacman.desktop
%{tde_datadir}/apps/tdepacman/
diff --git a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec
new file mode 100644
index 000000000..2364ece18
--- /dev/null
+++ b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec
@@ -0,0 +1,158 @@
+#
+# spec file for package twin-style-dekorator (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.10
+%endif
+%define tde_pkg twin-style-dekorator
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.0.5
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: Semi transparant window decoration for Trinity
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+
+%description
+Crystal offers you pseudo transparent titlebar, buttons and borders
+transparent, so you can see more of your lovely background image
+Transparancy and buttons can be costumized to match your wishes.
+Offers rounded corners as well
+
+And it is of course nice to look at. Upstream says:
+"- Don't forget to breathe, while drooling."
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_deKorator.la
+%{tde_tdelibdir}/twin3_deKorator.so
+%{tde_tdelibdir}/twin_deKorator_config.la
+%{tde_tdelibdir}/twin_deKorator_config.so
+%{tde_datadir}/apps/deKorator/
+%{tde_datadir}/apps/twin/deKorator.desktop
+
+
+%changelog
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index ee4514725..62954bd01 100755
--- a/redhat/build/get_latest_built_package_version.sh
+++ b/redhat/build/get_latest_built_package_version.sh
@@ -13,11 +13,25 @@ pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")"
pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")"
# Application packages: version does not match TDE version
-if [[ "${pkg_release}" =~ _0_ ]] || [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
- eval VERSION="${pkg_release/_0_/\~}"
+if [[ "${pkg_release}" =~ ^0_ ]] || [[ "${pkg_release}" =~ _0_ ]]; then
+ # Preversion
+ if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
+ # Likely application package
+ eval VERSION="${pkg_release/0_/\~}"
+ else
+ # Likely core package
+ eval VERSION="${pkg_version}${pkg_release/0_/\~}"
+ fi
+ VERSION="${VERSION/_~/\~}"
else
- # Base package (tdelibs ...)
- eval VERSION="${pkg_version}_${pkg_release/0_/\~}"
+ # Stable version
+ if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
+ # Likely application package
+ eval VERSION="${pkg_release/_*/}"
+ else
+ # Likely core package
+ eval VERSION="${pkg_version}"
+ fi
fi
VERSION="${VERSION%.opt}" # Remove '.opt' suffix
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh
index f890bfb2e..7f06af83e 100755
--- a/redhat/build/rpmdist.sh
+++ b/redhat/build/rpmdist.sh
@@ -24,7 +24,7 @@ case $a in
;;
# CentOS release 5.7 (Final)
# CentOS Linux release 6.0 (Final)
- CentOS*)
+ CentOS*|Rocky*)
if [ $c = "release" ]; then
RHEL="${d%%.*}"; DIST=".el${RHEL}"
else
diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt3/build-examples.sh
index f8ef0b95c..4d654fcc9 120000
--- a/redhat/dependencies/tqt3/build-examples.sh
+++ b/redhat/dependencies/tqt3/build-examples.sh
@@ -1 +1 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/build-examples.sh \ No newline at end of file
+../../../debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh \ No newline at end of file
diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64
index e86d2a75d..3b1aee7d6 100644
--- a/redhat/docker/f34/Dockerfile.x86_64
+++ b/redhat/docker/f34/Dockerfile.x86_64
@@ -18,9 +18,8 @@ COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
# Fix utempter detection
-RUN chmod a+r /usr/libexec/utempter/utempter
-
-RUN chmod 777 /tmp
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity \
diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64
new file mode 100644
index 000000000..b4a34b522
--- /dev/null
+++ b/redhat/docker/f35/Dockerfile.x86_64
@@ -0,0 +1,36 @@
+FROM fedora:35
+
+ARG TDE_VERSION=14.0.10
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-35.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages
new file mode 100644
index 000000000..619279797
--- /dev/null
+++ b/redhat/docker/f35/packages
@@ -0,0 +1,236 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+createrepo
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libqalculate-devel
+libpqxx-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wireless-tools-devel
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f35/rpmbuild.repo b/redhat/docker/f35/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f35/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f35/rpmmacros b/redhat/docker/f35/rpmmacros
new file mode 100644
index 000000000..f8169a30e
--- /dev/null
+++ b/redhat/docker/f35/rpmmacros
@@ -0,0 +1,6 @@
+%dist .fc35
+%_smp_mflags -j8
+%jobs 8
+%__cmake_builddir %nil
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh
index f2d686df5..1a78e6340 100755
--- a/redhat/docker/opensuse32.sh
+++ b/redhat/docker/opensuse32.sh
@@ -32,14 +32,20 @@ sudo zypper --root "${INSTALLROOT}" \
sudo setarch i686 zypper --root "${INSTALLROOT}" \
install --download-only -y \
bash \
+ docbook-utils \
filesystem \
+ gawk \
glibc \
glibc-extra \
+ grep \
+ gzip \
libpcre1 \
libselinux1 \
openSUSE-release \
system-user-root \
util-linux vim \
+ xz \
+ zlib \
zypper
sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm"
diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages
index 70b135dd7..78c263029 100644
--- a/redhat/docker/oss153/packages
+++ b/redhat/docker/oss153/packages
@@ -165,13 +165,13 @@ perl-pcsc
pkcs11-helper-devel
pkgconfig(pygtk-2.0)
postgresql10
-postgresql10-devel
python-devel
python3-devel
python3-sip-devel
recode
rpcgen
rpm-build
+rpmlint
rsvg-convert
ruby
ruby-devel
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 9b74d32ec..1dc309104 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -24,3 +24,13 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
&& mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Add GeoIP
+RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
+
+# Add lilypond (i686 only)
+RUN setarch ${ARCH} sudo zypper -n install dblatex fontforge ghostscript-fonts-other mftrace "pkgconfig(guile-1.8)" potrace-devel t1utils texi2html texlive-lh texinfo \
+ && rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-2.1.src.rpm \
+ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
+ && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index aec6aeb62..d708590cd 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -24,3 +24,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
&& mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Add GeoIP
+RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 623129a61..8a8f664f1 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -111,7 +111,6 @@ libofx-devel
libopenssl-devel
libotr-devel
libpaper-devel
-libpisock-devel
libpng16-devel
libpoppler-devel
libpqxx-devel
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index 1b72a6d01..30bb665db 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -28,7 +28,7 @@ gnutls
grep
gzip
icu
-icu65-data
+icu69-data
info-install
kernel-userspace-headers
krb5
@@ -52,10 +52,12 @@ lib64curl4
lib64db4.8
lib64dbnss4.8
lib64elfutils1
+lib64ev4
lib64expat1
lib64ext2fs2
lib64fdisk1
lib64ffi6
+lib64ffi8
lib64fuse2
lib64fuse3_3
lib64gcrypt20
@@ -68,7 +70,7 @@ lib64gmp10
lib64gnutls30
lib64gpg-error0
lib64gudev1.0_0
-lib64icu65
+lib64icu69
lib64idn2_0
lib64intl8
lib64iso9660_7
@@ -109,6 +111,7 @@ lib64png3
lib64popt0
lib64psl5
lib64python3.6
+lib64readline7
lib64readline8
lib64rpm1
lib64rtmp1
@@ -124,6 +127,7 @@ lib64tiff3
lib64tiff5
lib64tirpc3
lib64udev0
+lib64unbound8
lib64unistring2
lib64usb1.0_0
lib64usb-compat0.1_4
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index aa906f26c..cd7689569 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -47,11 +47,12 @@ sudo chroot "${INSTALLROOT}" apt-get -y upgrade
sudo umount "${INSTALLROOT}/dev/shm"
sudo umount "${INSTALLROOT}/dev"
-sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
+docker rmi -f "${IMAGE}" || :
+sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}"
+docker run -ti --rm "${IMAGE}" ls -l
sudo rm -rf "${INSTALLROOT}"
-docker rmi -f "${IMAGE}" || :
-cat "${IMAGE}.tar" | docker import - "${IMAGE}"
+docker image save "${IMAGE}" >"${IMAGE}.tar"
rm -f "${IMAGE}.tar.gz"
pigz -9 "${IMAGE}.tar"
mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 3d9b6c38b..abbbc7948 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -60,6 +60,8 @@ lib64geoip-devel
lib64gif-devel
lib64gpod4
lib64gpod-devel
+lib64gstreamer1.0-devel
+lib64gstreamer-plugins-base1.0-devel
lib64idn-devel
lib64inotifytools-devel
lib64iw29-devel
@@ -72,6 +74,7 @@ lib64poppler-devel
lib64readline-devel
lib64sane1-devel
lib64sndfile-devel
+lib64unwind-devel
lib64usb1.0-devel
lib64usb-compat0.1-devel
lib64wv2-devel
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index 067e3aa64..bbb269929 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -2,3 +2,4 @@
%_smp_mflags -j8
%jobs 8
%pclinuxos 2021
+%configure %configure2_5x
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index f445562fc..2470b3412 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -97,7 +97,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
# Rename binary to avoid conflict with kde3
mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2"
-
+ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist"
%clean
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 08d13bec6..b4378d26c 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -218,12 +218,14 @@ Requires: trinity-tdepacman
Requires: trinity-tdepowersave
%endif
Requires: trinity-tderadio
+Requires: trinity-tdesshaskpass
Requires: trinity-tdesudo
Requires: trinity-tdesvn
Requires: trinity-tdmtheme
Requires: trinity-tellico
Requires: trinity-tork
Requires: trinity-twin-style-crystal
+Requires: trinity-twin-style-dekorator
Requires: trinity-twin-style-suse2
Requires: trinity-wlassistant
Requires: trinity-yakuake
diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index 06857a93b..159f01c1d 100644
--- a/redhat/libraries/libkdcraw/libkdcraw.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -59,7 +59,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-filesystem >= %{tde_version}
-BuildRequires: automake autoconf libtool
+BuildRequires: cmake libtool
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
@@ -161,38 +161,48 @@ library documentation is available on kdcraw.h header file.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: gcc-hidden-visibility causes FTBFS in digikam !
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc35 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc35
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc35
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session include postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc35 b/redhat/main/tdebase/pamd.kdm-trinity.fc35
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc35
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth required pam_env.so
+auth substack system-auth
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet.so
+-auth optional pam_kwallet5.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet.so
+-session optional pam_kwallet5.so
+session include postlogin
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 0b94976ab..23bc95c3f 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -277,6 +277,14 @@ Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
+# Fedora 35 Theme
+%if 0%{?fedora} == 35
+Requires: f35-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f34/default/standard/f35.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
# RHEL 4 Theme
%if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic
@@ -1894,7 +1902,7 @@ Requires: psmisc
%if 0%{?with_hal}
Requires: hal >= 0.5
%endif
-#%if 0%{?rhel} == 4 || 0%{?suse_version}
+#%if 0%{?rhel} == 4 || 0%{?suse_version} || 0%{?fedora} >= 35
#Requires: cryptsetup
#%else
#Requires: cryptsetup-luks
diff --git a/redhat/main/tdebase/tdm.fc35.te b/redhat/main/tdebase/tdm.fc35.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc35.te
@@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+ type fprintd_t;
+ type init_t;
+ class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/main/tdebase/tdm.service.fc35 b/redhat/main/tdebase/tdm.service.fc35
new file mode 100644
index 000000000..9ef7e07ff
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc35
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
index 1ecba4d30..3a44d164b 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/main/tdelibs/tdelibs.spec
@@ -241,7 +241,7 @@ BuildRequires: xorg-x11-devel
%endif
# ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
Requires: iceauth
BuildRequires: iceauth
%endif
@@ -277,7 +277,7 @@ Requires: ca-certificates
%endif
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8
Requires: rootcerts
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%else
@@ -379,7 +379,7 @@ Requires: udisks
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
BuildRequires: libudisks2-devel
%else
-%if 0%{?suse_version} >= 1550
+6+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
BuildRequires: libudisks2-0-devel
%else
BuildRequires: udisks2-devel
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 86e66f620..53560862a 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -596,7 +596,6 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png
%{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png
%{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_original.png
%{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png
%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png
%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png
@@ -641,7 +640,6 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/icons/hicolor/*/actions/jabber_na.png
%{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png
%{tde_datadir}/icons/hicolor/*/actions/jabber_online.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_original.png
%{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png
%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png
%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png
@@ -1110,7 +1108,7 @@ fi
-DWITH_GSM=OFF \
-DWITH_XMMS=OFF \
-DWITH_ARTS=ON \
- %{?with_openslp:-DWITH_SLP=ON} \
+ %{!?with_openslp:-DWITH_SLP=OFF} \
-DBUILD_ALL=ON \
-DBUILD_KOPETE_PLUGIN_ALL=ON \
-DBUILD_KOPETE_PROTOCOL_ALL=ON \
diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec
index e4edbf952..fc8f62256 100644
--- a/redhat/main/tdetoys/tdetoys.spec
+++ b/redhat/main/tdetoys/tdetoys.spec
@@ -62,6 +62,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-kdesktop >= %{tde_version}
BuildRequires: trinity-kicker >= %{tde_version}
+BuildRequires: trinity-konqueror >= %{tde_version}
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
@@ -332,7 +333,10 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_tdelibdir}/kweatherreport.la
%{tde_tdelibdir}/weather_panelapplet.la
%{tde_tdelibdir}/weather_panelapplet.so
+%{tde_tdelibdir}/weather_sidebar.la
+%{tde_tdelibdir}/weather_sidebar.so
%{tde_datadir}/apps/kicker/applets/kweather.desktop
+%{tde_datadir}/apps/konqsidebartng/
%{tde_datadir}/apps/kweather/
%{tde_datadir}/apps/kweatherservice/
%{tde_datadir}/icons/hicolor/*/apps/kweather.png
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
index 9737d93a4..38f031651 100644
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
@@ -1,2 +1,2 @@
INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..ed34bb3c2 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -31,8 +31,6 @@ debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
debian/tmp/opt/trinity/lib/ruby_lib/* /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
debian/tmp/opt/trinity/bin/amarok
debian/tmp/opt/trinity/bin/amarokapp
debian/tmp/opt/trinity/bin/amarok_libvisual
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 8cd20b0ee..9e0aebf98 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
@@ -17,7 +17,7 @@ Homepage: http://amarok.kde.org
Package: amarok-trinity
Architecture: any
-Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
+Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
@@ -45,6 +45,16 @@ Description: versatile and easy to use audio player for Trinity
Support for libvisual visualization plugins is also compiled in (you need
to have libvisual-0.4-plugins installed to be able to use it).
+Package: libamarok-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Breaks: amarok-trinity (<< 4:14.0.11~)
+Replaces: amarok-trinity (<< 4:14.0.11~)
+Description: base library for Amarok [Trinity]
+ This package contains base library needed for Amarok to run properly.
+ Therefore, unless you have 'amarok' package installed, you will hardly
+ find this package useful.
+
Package: amarok-common-trinity
Architecture: all
Depends: ruby
@@ -72,7 +82,7 @@ Description: Amarok sidebar for konqueror [Trinity]
Package: amarok-engines-trinity
Architecture: all
Depends: amarok-engine-xine-trinity (>= ${source:Version}) | amarok-engine-akode-trinity (>= ${source:Version})
-Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version})
Replaces: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
Breaks: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
Description: output engines for the Amarok music player [Trinity]
@@ -100,18 +110,6 @@ Description: xine engine for the Amarok audio player [Trinity]
for some reason over the other engines (e.g., it is the lightest engine
Dependency-wise).
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Breaks: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features
- (like visualizations) might not be available while using this engine.
-
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/docs b/ubuntu/_base/applications/multimedia/amarok/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libamarok.so.0
+debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..55c147b76 100755
--- a/ubuntu/_base/applications/multimedia/amarok/debian/rules
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
-DWITH_IFP="OFF"
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
+++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/office/basket/debian/docs b/ubuntu/_base/applications/office/basket/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/office/basket/debian/docs
+++ b/ubuntu/_base/applications/office/basket/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/docs b/ubuntu/_base/applications/office/kbibtex/debian/docs
index c17f03764..960f99591 100644
--- a/ubuntu/_base/applications/office/kbibtex/debian/docs
+++ b/ubuntu/_base/applications/office/kbibtex/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
NEWS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/docs b/ubuntu/_base/applications/office/kbookreader/debian/docs
index 7d96d4e7e..76c3076c9 100644
--- a/ubuntu/_base/applications/office/kbookreader/debian/docs
+++ b/ubuntu/_base/applications/office/kbookreader/debian/docs
@@ -1,2 +1,3 @@
AUTHORS
+README.md
TODO
diff --git a/ubuntu/_base/applications/office/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control
index 7b699f3b0..cb01d0882 100644
--- a/ubuntu/_base/applications/office/kile/debian/control
+++ b/ubuntu/_base/applications/office/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://kile.sourceforge.net
diff --git a/ubuntu/_base/applications/office/kile/debian/patches/series b/ubuntu/_base/applications/office/kile/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/office/kile/debian/patches/series
diff --git a/ubuntu/_base/applications/office/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules
index bd5478578..59bca7cd4 100755
--- a/ubuntu/_base/applications/office/kile/debian/rules
+++ b/ubuntu/_base/applications/office/kile/debian/rules
@@ -1,60 +1,39 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-install/kile-trinity-i18n-br::
- -for language in `cd translations; ls -1d */`; do \
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/$$language; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-$$language; \
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
+
+common-install-indep::
+ # Install translations into individual packages
+ -for language in `cd debian/tmp/opt/trinity/share/locale; ls -1d */`; do \
+ pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+ install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale; \
+ cp -a $(CURDIR)/debian/tmp/opt/trinity/share/locale/$$language \
+ $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale/$$language; \
+ done
+ -for language in `cd debian/tmp/opt/trinity/share/doc/tde/HTML; ls -1d */ | grep -v '^en/'`; do \
+ pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+ install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML; \
+ cp -a $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/$$language \
+ $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML/$$language; \
done
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/en_GB/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-engb
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/pt_BR/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-ptbr
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/sr@Latn/;\
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-srlatin
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/zh_CN/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-zhcn
install/kile-trinity::
# Install pixmap
install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm
- chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh
-
clean::
rm -rf debian/kile-trinity-i18n-*
diff --git a/ubuntu/_base/applications/office/kile/debian/watch b/ubuntu/_base/applications/office/kile/debian/watch
deleted file mode 100644
index e372a7062..000000000
--- a/ubuntu/_base/applications/office/kile/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/office/knowit/debian/docs b/ubuntu/_base/applications/office/knowit/debian/docs
index 5502ed8f4..960f99591 100644
--- a/ubuntu/_base/applications/office/knowit/debian/docs
+++ b/ubuntu/_base/applications/office/knowit/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
NEWS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/office/tellico/debian/docs b/ubuntu/_base/applications/office/tellico/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/office/tellico/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/docs b/ubuntu/_base/applications/settings/kdpkg/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/settings/kdpkg/debian/docs
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/docs
@@ -1 +1,2 @@
AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/settings/kima/debian/docs b/ubuntu/_base/applications/settings/kima/debian/docs
index 1a4f0317f..1a960e71b 100644
--- a/ubuntu/_base/applications/settings/kima/debian/docs
+++ b/ubuntu/_base/applications/settings/kima/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
FAQ
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/docs b/ubuntu/_base/applications/settings/kiosktool/debian/docs
index 724e08449..6f7727790 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/docs
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/docs b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/docs
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
NEWS
-README
+README.md
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
index 087bcaaa1..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
@@ -1,5 +1,3 @@
-AUTHOR
-README
-
-
-
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/docs b/ubuntu/_base/applications/settings/tdesudo/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/tdesudo/debian/docs
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..960f99591 100644
--- a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
@@ -1,4 +1,4 @@
-doc/AUTHORS
-doc/NEWS
-doc/README
-doc/TODO
+AUTHORS
+NEWS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/dolphin/debian/docs b/ubuntu/_base/applications/system/dolphin/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/system/dolphin/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/katapult/debian/docs b/ubuntu/_base/applications/system/katapult/debian/docs
index 777273e59..a2b373b4d 100644
--- a/ubuntu/_base/applications/system/katapult/debian/docs
+++ b/ubuntu/_base/applications/system/katapult/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/docs b/ubuntu/_base/applications/system/kcmautostart/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/kcmautostart/debian/docs
+++ b/ubuntu/_base/applications/system/kcmautostart/debian/docs
@@ -1 +1,2 @@
AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/docs b/ubuntu/_base/applications/system/kdbusnotification/debian/docs
index e845566c0..b43bf86b5 100644
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/docs
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/ubuntu/_base/applications/system/klamav/debian/docs b/ubuntu/_base/applications/system/klamav/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/klamav/debian/docs
+++ b/ubuntu/_base/applications/system/klamav/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/system/knemo/debian/docs b/ubuntu/_base/applications/system/knemo/debian/docs
index c17f03764..960f99591 100644
--- a/ubuntu/_base/applications/system/knemo/debian/docs
+++ b/ubuntu/_base/applications/system/knemo/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
NEWS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/system/knetload/debian/docs b/ubuntu/_base/applications/system/knetload/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/system/knetload/debian/docs
+++ b/ubuntu/_base/applications/system/knetload/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/system/knetstats/debian/docs b/ubuntu/_base/applications/system/knetstats/debian/docs
index e845566c0..b43bf86b5 100644
--- a/ubuntu/_base/applications/system/knetstats/debian/docs
+++ b/ubuntu/_base/applications/system/knetstats/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/docs b/ubuntu/_base/applications/system/kshutdown/debian/docs
index 9341bcf45..d70cd6976 100644
--- a/ubuntu/_base/applications/system/kshutdown/debian/docs
+++ b/ubuntu/_base/applications/system/kshutdown/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
-README
+README.md
TODO
VERSION
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/docs b/ubuntu/_base/applications/system/ksystemlog/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/ksystemlog/debian/docs
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/docs b/ubuntu/_base/applications/system/kvkbd/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/kvkbd/debian/docs
+++ b/ubuntu/_base/applications/system/kvkbd/debian/docs
@@ -1 +1,2 @@
AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/docs b/ubuntu/_base/applications/system/smartcardauth/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/docs b/ubuntu/_base/applications/system/tdesshaskpass/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/docs b/ubuntu/_base/applications/themes/tde-style-domino/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/docs
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
index 0948b8ef4..4c9a51eb2 100644
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
+++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
@@ -1,4 +1,4 @@
+AUTHORS
BUGS
-README
+README.md
TODO
-AUTHORS
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/docs b/ubuntu/_base/applications/utilities/filelight/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/filelight/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/docs b/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
index 1ed9b5bd5..b72409e5a 100644
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
FAQ
-README
+README.md
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/docs b/ubuntu/_base/applications/utilities/kdirstat/debian/docs
index 7f03542b1..871711684 100644
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/docs
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/docs
@@ -1,4 +1,4 @@
AUTHORS
CREDITS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/utilities/keep/debian/docs b/ubuntu/_base/applications/utilities/keep/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/keep/debian/docs
+++ b/ubuntu/_base/applications/utilities/keep/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/docs b/ubuntu/_base/applications/utilities/knutclient/debian/docs
index e845566c0..0b6e0f321 100644
--- a/ubuntu/_base/applications/utilities/knutclient/debian/docs
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/utilities/krename/debian/docs b/ubuntu/_base/applications/utilities/krename/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/krename/debian/docs
+++ b/ubuntu/_base/applications/utilities/krename/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/docs b/ubuntu/_base/applications/utilities/ksensors/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/ksensors/debian/docs
+++ b/ubuntu/_base/applications/utilities/ksensors/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/docs b/ubuntu/_base/applications/utilities/mathemagics/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/docs
+++ b/ubuntu/_base/applications/utilities/mathemagics/debian/docs
@@ -1,2 +1,2 @@
AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/common/cmake/debian/control b/ubuntu/_base/common/cmake/debian/control
index 1363e01ee..50ea830ef 100644
--- a/ubuntu/_base/common/cmake/debian/control
+++ b/ubuntu/_base/common/cmake/debian/control
@@ -2,7 +2,7 @@ Source: cmake-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
Standards-Version: 3.8.4
Package: cmake-trinity
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control
index 651d7e4ea..3dea89d45 100644
--- a/ubuntu/_base/core/tdebase/debian/control
+++ b/ubuntu/_base/core/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
Architecture: all
Replaces: kdebase-kde3 (<< 4:14.0.0~), kdebase-trinity (<< 4:14.0.0~)
Breaks: kdebase-kde3 (<< 4:14.0.0~), kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${source:Version})
Description: base components from the official TDE release
diff --git a/ubuntu/_base/core/tdebindings/debian/control b/ubuntu/_base/core/tdebindings/debian/control
index 52758928a..651da2701 100644
--- a/ubuntu/_base/core/tdebindings/debian/control
+++ b/ubuntu/_base/core/tdebindings/debian/control
@@ -1,7 +1,7 @@
Source: tdebindings-trinity
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
- default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc],
+ default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev
Section: devel
diff --git a/ubuntu/_base/core/tdegraphics/debian/rules b/ubuntu/_base/core/tdegraphics/debian/rules
index d29cd5566..5598266c2 100755
--- a/ubuntu/_base/core/tdegraphics/debian/rules
+++ b/ubuntu/_base/core/tdegraphics/debian/rules
@@ -26,9 +26,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_ALL="ON" \
- -DWITH_TIFF="ON" \
- -DWITH_OPENEXR="ON" \
- -DWITH_PDF="ON"
+ -DWITH_ALL_OPTIONS="ON"
DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg
diff --git a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
index 34499d446..4ce8d6ef8 100644
--- a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
+++ b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
@@ -2,10 +2,12 @@ debian/tmp/opt/trinity/bin/kweatherservice
debian/tmp/opt/trinity/bin/kweatherreport
debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.so
debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.la
-debian/tmp/opt/trinity/lib/trinity/kcm_weather.so
-debian/tmp/opt/trinity/lib/trinity/kcm_weather.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.la
debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so
debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.la
debian/tmp/opt/trinity/lib/trinity/kweatherreport.so
debian/tmp/opt/trinity/lib/trinity/kweatherreport.la
debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.la
@@ -27,5 +29,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kweather.png
debian/tmp/opt/trinity/share/man/man1/kweatherreport.1
debian/tmp/opt/trinity/share/man/man1/kweatherservice.1
debian/tmp/opt/trinity/share/services/kweatherservice.desktop
-debian/tmp/opt/trinity/share/services/kcmweather.desktop
+debian/tmp/opt/trinity/share/services/kcmweatherapplet.desktop
debian/tmp/opt/trinity/share/services/kcmweatherservice.desktop
+debian/tmp/opt/trinity/share/services/kcmweatherstations.desktop
diff --git a/ubuntu/_base/dependencies/akode/debian/docs b/ubuntu/_base/dependencies/akode/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/dependencies/akode/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/changelog b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog
new file mode 100644
index 000000000..58e4a45de
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog
@@ -0,0 +1,66 @@
+polkit-tqt (0.103.0-2) unstable; urgency=low
+
+ * Port to TQt3 and package renaming
+ * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Mon, 01 Nov 2021 14:03:00 +0900
+
+polkit-qt-1 (0.103.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - fix annoying crash on shutdown. (Closes: #651815)
+
+ [ Felix Geyer ]
+ * Modify CFLAGS/CXXFLAGS after including debian-qt-kde.mk so the changes are
+ not overwritten.
+
+ [ Fathi Boudra ]
+ * Update debian/compat: bump to 8.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 14 Dec 2011 09:15:10 -0500
+
+polkit-qt-1 (0.99.0-3) unstable; urgency=low
+
+ [ Modestas Vainius ]
+ * Update symbol files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 May 2011 00:31:01 +0300
+
+polkit-qt-1 (0.99.0-2) experimental; urgency=low
+
+ * Bump Standards-Version to 3.9.2: no changes needed.
+ * Build library with -fvisibility=hidden -fvisibility-inlines-hidden.
+ * Update symbol file: many private symbols are gone due to above.
+
+ -- Modestas Vainius <modax@debian.org> Thu, 28 Apr 2011 11:53:35 +0300
+
+polkit-qt-1 (0.99.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Modestas Vainius ]
+ * Add Vcs fields to debian/control.
+ * Switch debian/rules engine to qt-kde-team/2/*.
+ * Bump Standards-Version to 3.9.1: no changes needed.
+ * Remove dupe "Section" field from debian/control.
+ * Include verbatim BSD license to debian/copyright.
+ * Override lintian libpolkit-qt-1-0: package-name-doesnt-match-sonames.
+ * Use more failsafe wildcards in libpolkit-qt-1-0.install.
+ * Add myself to Uploaders.
+ * SONAME bumped: rename libpolkit-qt-1-0 to libpolkit-qt-1-1.
+ * Add symbol file for libpolkit-qt-1-1.
+ * Update debian/copyright.
+
+ [ Didier Raboud ]
+ * Bump B-D of libpolkit to >= 0.98.
+
+ [ José Manuel Santamaría Lema ]
+ * Update installed files.
+
+ -- Modestas Vainius <modax@debian.org> Mon, 14 Mar 2011 01:03:06 +0200
+
+polkit-qt-1 (0.95.1-1) unstable; urgency=low
+
+ * Initial release. (Closes: #565395)
+
+ -- Fathi Boudra <fabo@debian.org> Fri, 15 Jan 2010 12:50:13 +0100
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/compat b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/control b/ubuntu/_base/dependencies/polkit-tqt/debian/control
new file mode 100644
index 000000000..7da8dc684
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/control
@@ -0,0 +1,61 @@
+Source: polkit-tqt
+Section: devel
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev,
+ libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev
+Standards-Version: 3.9.2
+
+Package: libpolkit-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the files necessary for running applications that use
+ the libpolkit-tqt library.
+
+Package: libpolkit-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: libpolkit-tqt (= ${binary:Version}), libtqtinterface-dev
+Suggests: libpolkit-tqt-examples
+Description: PolicyKit-tqt development files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the development libraries and headers.
+
+Package: libpolkit-tqt-examples
+Section: libs
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library example files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains example files and applications.
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/copyright b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright
new file mode 100644
index 000000000..19e2663aa
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright
@@ -0,0 +1,101 @@
+This code was ported to TQt3 and packaged for Debian by:
+ Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+ https://snapshot.debian.org/package/polkit-qt-1/0.103.0-1/
+
+Original polkit-qt-1 code was packaged for Debian by:
+
+ Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+ Daniel Nicoletti <dantti85-dev@yahoo.com.br>
+ Dario Freddi <drf@kde.org>
+ Jaroslav Reznik <jreznik@redhat.com>
+ Radek Novacek <rnovacek@redhat.com>
+ Lukas Tinkl <ltinkl@redhat.com>
+ Pino Toscano <pino@kde.org>
+
+Copyright:
+
+ Copyright (C) 2008-2009 Daniel Nicoletti
+ Copyright (C) 2009-2010 Dario Freddi
+ Copyright (C) 2009 Jaroslav Reznik
+ Copyright (C) 2009 Radek Novacek
+ Copyright (C) 2009 Lukas Tinkl
+
+Copyright for polkit-tqt-export.h file:
+
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
+ Copyright (C) 2007 David Faure <faure@kde.org>
+
+Copyright for polkittqt1-version.h.cmake file:
+
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
+ Copyright (C) 2007 Sebastian Trueg <trueg@kde.org>
+
+Copyright for cmake/modules/FindAutomoc4.cmake file:
+
+ Copyright (C) 2008-2009 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/MacroPushRequiredVars.cmake file:
+
+ Copyright (C) 2006 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/InstallSettings.cmake file:
+
+ Copyright (C) 2008 Kevin Krammer <kevin.krammer@gmx.at>
+
+License for cmake modules:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2' and
+`/usr/share/common-licenses/LGPL-3'.
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+ Copyright (C) 2011 Modestas Vainius <modax@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/docs b/ubuntu/_base/dependencies/polkit-tqt/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
new file mode 100644
index 000000000..698c043d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
@@ -0,0 +1,31 @@
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/ActionDescription
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Listener
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Session
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Authority
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Details
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/Action
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButton
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButtons
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Identity
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Subject
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/TemporaryAuthorization
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-actiondescription.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-listener.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-session.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-authority.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-details.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-export.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-action.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbutton.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbuttons.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-identity.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-subject.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-temporaryauthorization.h
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-agent.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-core.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-gui.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-agent.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-core.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-gui.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/polkit-tqt.cmake
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
new file mode 100644
index 000000000..5bb70628a
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
@@ -0,0 +1,8 @@
+debian/tmp/etc/dbus-1/system.d/org.tqt.policykit.examples.conf
+debian/tmp/usr/bin/polkit-tqt-agent-example
+debian/tmp/usr/bin/polkit-tqt-example
+debian/tmp/usr/bin/polkit-tqt-example-helper
+debian/tmp/usr/share/apps/polkit-tqt/examples/*
+debian/tmp/usr/share/apps/polkit-tqt/icons/*
+debian/tmp/usr/share/dbus-1/system-services/org.tqt.policykit.examples.service
+debian/tmp/usr/share/polkit-1/actions/org.tqt.policykit.examples.policy
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
new file mode 100644
index 000000000..1bbe0900a
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-*.so.*
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/rules b/ubuntu/_base/dependencies/polkit-tqt/debian/rules
new file mode 100755
index 000000000..71edffe1c
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+ifdef DEB_HOST_MULTIARCH
+ CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+ CMAKE_INSTALL_LIBDIR = lib
+endif
+
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DBUILD_ALL="ON"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/source/format b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/source/options b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
index ae635cbcd..735874a93 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
@@ -1 +1 @@
-usr/share/sip/tqt
+usr/share/sip-tqt/tqt
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
index 7b6aca191..0f144be95 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
@@ -1,2 +1 @@
-sip/* usr/share/sip/tqt
-
+sip/* usr/share/sip-tqt/tqt
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 36e6c1349..bd57734b2 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
@@ -1,15 +1,14 @@
# lintian test overriden as the files tripping this error are put into the source
# of the generated package. This is a false-positive
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
-
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip
+pyth