diff --git a/CMakeLists.txt b/CMakeLists.txt index 622e150a4..d12a7fa30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,8 +93,8 @@ endif() # mostly relevant to the build process, also stored in the version file for CMake and in qconfig.h.cmake set(KATIE_MAJOR "4") set(KATIE_MINOR "11") -set(KATIE_MICRO "0") -set(KATIE_HEX "0x041100") +set(KATIE_MICRO "1") +set(KATIE_HEX "0x041101") set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}") # only for the build process diff --git a/appveyor.yml b/appveyor.yml index 369245ba8..e3e3fb7f7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 4.11.0-{branch}-{build} +version: 4.11.1-{branch}-{build} image: Ubuntu2004 clone_depth: 1 cache: diff --git a/doxygen.conf b/doxygen.conf index d87b0868b..84c57f8ad 100644 --- a/doxygen.conf +++ b/doxygen.conf @@ -38,7 +38,7 @@ PROJECT_NAME = "Katie" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.11.0 +PROJECT_NUMBER = 4.11.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index f3236f333..5f83f5408 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -4,7 +4,7 @@ # https://wiki.archlinux.org/index.php/Arch_package_guidelines pkgname=katie-git -pkgver=4.11.0.r4681.8f22ea5f +pkgver=4.11.1.r4681.8f22ea5f pkgrel=1 pkgdesc='C++ toolkit derived from the Qt 4.8 framework' arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm') @@ -20,7 +20,7 @@ conflicts=('katie') pkgver() { cd katie - printf "4.11.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "4.11.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { diff --git a/package/debian/changelog b/package/debian/changelog index 25f2306bc..01df07fb6 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,14 @@ -katie (4.11.0) unstable; urgency=medium +katie (4.11.1) unstable; urgency=medium + + * Sixed package update + + -- Ivailo Monev Tue, 23 Nov 2021 12:49:58 +0200 + +katie (4.11.0) stable; urgency=medium * Fifth package update - -- Ivailo Monev Fri, 13 Aug 2020 07:32:58 +0200 + -- Ivailo Monev Fri, 13 Aug 2021 07:32:58 +0200 katie (4.10.0) stable; urgency=medium diff --git a/package/debian/control b/package/debian/control index 5deecadfb..910c6dd1b 100644 --- a/package/debian/control +++ b/package/debian/control @@ -4,7 +4,7 @@ Maintainer: Ivailo Monev Homepage: https://github.com/fluxer/katie Vcs-Git: git://github.com/fluxer/katie.git Vcs-browser: https://github.com/fluxer/katie -Standards-Version: 4.11.0 +Standards-Version: 4.11.1 Build-Depends: debhelper (>= 9~), libssl-dev, zlib1g-dev, libzstd-dev, libc6-dev, libjansson-dev, libpng-dev, libjpeg-dev, libtiff5-dev, libcups2-dev, libfreetype6-dev, libfontconfig1-dev, libpcre3-dev, diff --git a/package/fedora/katie.spec b/package/fedora/katie.spec index 24b0e2ca7..a14ac5b5b 100644 --- a/package/fedora/katie.spec +++ b/package/fedora/katie.spec @@ -1,7 +1,7 @@ # https://docs.fedoraproject.org/en-US/packaging-guidelines/ Name: katie -Version: 4.11.0 +Version: 4.11.1 Release: 1%{?dist} Summary: C++ toolkit derived from the Qt 4.8 framework License: BSD and LGPLv2+ @@ -66,6 +66,9 @@ This package includes headers, pkg-config and CMake files. %{_libdir}/cmake/Katie/* %changelog +* Tue Nov 23 2021 Ivailo Monev - 4.11.1-1 +- package update + * Fri Aug 13 2021 Ivailo Monev - 4.11.0-1 - package update diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile index e3fcab446..5c057a3a4 100644 --- a/package/freebsd/Makefile +++ b/package/freebsd/Makefile @@ -1,7 +1,7 @@ # https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/ PORTNAME = katie -DISTVERSION = 4.11.0.d20201231 +DISTVERSION = 4.11.1.d20201231 CATEGORIES = devel x11 ftp net www MAINTAINER = xakepa10@gmail.com COMMENT = C++ toolkit derived from the Qt 4.8 framework diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist index 8a6b3aec9..d400cf4c0 100644 --- a/package/freebsd/pkg-plist +++ b/package/freebsd/pkg-plist @@ -1414,43 +1414,43 @@ lib/katie/plugins/imageformats/libqtiff.so lib/katie/plugins/script/libqtscriptdbus.so lib/libKtCore.so lib/libKtCore.so.4.11 -lib/libKtCore.so.4.11.0 +lib/libKtCore.so.4.11.1 lib/libKtDBus.so lib/libKtDBus.so.4.11 -lib/libKtDBus.so.4.11.0 +lib/libKtDBus.so.4.11.1 lib/libKtDeclarative.so lib/libKtDeclarative.so.4.11 -lib/libKtDeclarative.so.4.11.0 +lib/libKtDeclarative.so.4.11.1 lib/libKtDesigner.so lib/libKtDesigner.so.4.11 -lib/libKtDesigner.so.4.11.0 +lib/libKtDesigner.so.4.11.1 lib/libKtDesignerComponents.so lib/libKtDesignerComponents.so.4.11 -lib/libKtDesignerComponents.so.4.11.0 +lib/libKtDesignerComponents.so.4.11.1 lib/libKtGui.so lib/libKtGui.so.4.11 -lib/libKtGui.so.4.11.0 +lib/libKtGui.so.4.11.1 lib/libKtNetwork.so lib/libKtNetwork.so.4.11 -lib/libKtNetwork.so.4.11.0 +lib/libKtNetwork.so.4.11.1 lib/libKtScript.so lib/libKtScript.so.4.11 -lib/libKtScript.so.4.11.0 +lib/libKtScript.so.4.11.1 lib/libKtScriptTools.so lib/libKtScriptTools.so.4.11 -lib/libKtScriptTools.so.4.11.0 +lib/libKtScriptTools.so.4.11.1 lib/libKtSvg.so lib/libKtSvg.so.4.11 -lib/libKtSvg.so.4.11.0 +lib/libKtSvg.so.4.11.1 lib/libKtTest.so lib/libKtTest.so.4.11 -lib/libKtTest.so.4.11.0 +lib/libKtTest.so.4.11.1 lib/libKtUiTools.so lib/libKtUiTools.so.4.11 -lib/libKtUiTools.so.4.11.0 +lib/libKtUiTools.so.4.11.1 lib/libKtXml.so lib/libKtXml.so.4.11 -lib/libKtXml.so.4.11.0 +lib/libKtXml.so.4.11.1 libdata/pkgconfig/KtCore.pc libdata/pkgconfig/KtDBus.pc libdata/pkgconfig/KtDeclarative.pc diff --git a/package/netbsd/Makefile b/package/netbsd/Makefile index 908164795..8066d20b8 100644 --- a/package/netbsd/Makefile +++ b/package/netbsd/Makefile @@ -4,7 +4,7 @@ # https://www.netbsd.org/docs/pkgsrc/ DISTNAME = master -PKGNAME = katie-4.11.0.d20201231 +PKGNAME = katie-4.11.1.d20201231 CATEGORIES = devel x11 net www MAINTAINER = xakepa10@gmail.com COMMENT = C++ toolkit deived from the Qt 4.8 framework diff --git a/package/netbsd/buildlink3.mk b/package/netbsd/buildlink3.mk index ea9811dca..fb03b6e31 100644 --- a/package/netbsd/buildlink3.mk +++ b/package/netbsd/buildlink3.mk @@ -5,7 +5,7 @@ BUILDLINK_TREE+= katie .if !defined(KATIE_BUILDLINK3_MK) KATIE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.katie+= katie>=4.11.0.d20201231 +BUILDLINK_API_DEPENDS.katie+= katie>=4.11.1.d20201231 BUILDLINK_PKGSRCDIR.katie?= ../../devel/katie .endif # KATIE_BUILDLINK3_MK diff --git a/package/openbsd/Makefile b/package/openbsd/Makefile index c6a8cda65..2deff8028 100644 --- a/package/openbsd/Makefile +++ b/package/openbsd/Makefile @@ -3,7 +3,7 @@ # https://www.openbsd.org/faq/ports/ DISTNAME = katie -PKGNAME = katie-4.11.0.d20201231 +PKGNAME = katie-4.11.1.d20201231 CATEGORIES = devel x11 net www MAINTAINER = Ivailo Monev COMMENT = C++ toolkit derived from the Qt 4.8 framework diff --git a/scripts/genman.py b/scripts/genman.py index 977c5e0ce..f90010ae4 100755 --- a/scripts/genman.py +++ b/scripts/genman.py @@ -23,7 +23,7 @@ for root, sdir, lfiles in os.walk('%s/../src/tools' % cwd): ofile = ifile.replace('.pod', '.1') subprocess.check_call( (pod2man, - '--release=Katie 4.11.0', + '--release=Katie 4.11.1', '--center=Katie Manual', '--section=1', '--utf8', diff --git a/scripts/tarball.sh b/scripts/tarball.sh index 5d5797eb2..f6c385f3b 100755 --- a/scripts/tarball.sh +++ b/scripts/tarball.sh @@ -4,6 +4,6 @@ set -e cwd="$(readlink -f $(dirname $0))" -tarball="Katie-4.11.0-Source" +tarball="Katie-4.11.1-Source" git archive HEAD --format=tar --prefix="$tarball/" | xz > "$cwd/../$tarball.tar.xz" diff --git a/src/core/io/qdatastream.h b/src/core/io/qdatastream.h index 4216b3488..6d6f32fb7 100644 --- a/src/core/io/qdatastream.h +++ b/src/core/io/qdatastream.h @@ -48,7 +48,7 @@ public: Qt_4_9 = Qt_4_8, Qt_4_10 = Qt_4_9, Qt_4_11 = Qt_4_10, -#if QT_VERSION > 0x041100 +#if QT_VERSION > 0x041101 #error Add the datastream version for this version Qt_4_12 = Qt_4_11 #endif diff --git a/src/tools/moc/moc.1 b/src/tools/moc/moc.1 index f541310c0..e5ca709e4 100644 --- a/src/tools/moc/moc.1 +++ b/src/tools/moc/moc.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "MOC 1" -.TH MOC 1 "2021-09-20" "Katie 4.11.0" "Katie Manual" +.TH MOC 1 "2021-09-20" "Katie 4.11.1" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/qdbus/qdbus.1 b/src/tools/qdbus/qdbus.1 index d0aba5110..0d14d5592 100644 --- a/src/tools/qdbus/qdbus.1 +++ b/src/tools/qdbus/qdbus.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUS 1" -.TH QDBUS 1 "2021-09-20" "Katie 4.11.0" "Katie Manual" +.TH QDBUS 1 "2021-09-20" "Katie 4.11.1" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/qdbus/qdbuscpp2xml.1 b/src/tools/qdbus/qdbuscpp2xml.1 index 668db9087..b547b2290 100644 --- a/src/tools/qdbus/qdbuscpp2xml.1 +++ b/src/tools/qdbus/qdbuscpp2xml.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUSCPP2XML 1" -.TH QDBUSCPP2XML 1 "2021-09-20" "Katie 4.11.0" "Katie Manual" +.TH QDBUSCPP2XML 1 "2021-09-20" "Katie 4.11.1" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/qdbus/qdbusxml2cpp.1 b/src/tools/qdbus/qdbusxml2cpp.1 index 50f04302e..ba2e1c858 100644 --- a/src/tools/qdbus/qdbusxml2cpp.1 +++ b/src/tools/qdbus/qdbusxml2cpp.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUSXML2CPP 1" -.TH QDBUSXML2CPP 1 "2021-09-20" "Katie 4.11.0" "Katie Manual" +.TH QDBUSXML2CPP 1 "2021-09-20" "Katie 4.11.1" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/qscript/qscript.1 b/src/tools/qscript/qscript.1 index 68ce7196b..b1de6cf8e 100644 --- a/src/tools/qscript/qscript.1 +++ b/src/tools/qscript/qscript.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QSCRIPT 1" -.TH QSCRIPT 1 "2021-09-20" "Katie 4.11.0" "Katie Manual" +.TH QSCRIPT 1 "2021-09-20" "Katie 4.11.1" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/rcc/rcc.1 b/src/tools/rcc/rcc.1 index 63dc1d8cc..b01583043 100644 --- a/src/tools/rcc/rcc.1 +++ b/src/tools/rcc/rcc.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "RCC 1" -.TH RCC 1 "2021-09-20" "Katie 4.11.0" "Katie Manual" +.TH RCC 1 "2021-11-22" "Katie 4.11.1" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/uic/uic.1 b/src/tools/uic/uic.1 index 6ed636444..3cff98ce5 100644 --- a/src/tools/uic/uic.1 +++ b/src/tools/uic/uic.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "UIC 1" -.TH UIC 1 "2021-09-20" "Katie 4.11.0" "Katie Manual" +.TH UIC 1 "2021-09-20" "Katie 4.11.1" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp index ae0a15246..2aa500320 100644 --- a/tests/auto/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/qdatastream/tst_qdatastream.cpp @@ -255,7 +255,7 @@ static int NColorRoles[] = { QPalette::ToolTipText + 1, // Qt_4_9 QPalette::ToolTipText + 1, // Qt_4_10 QPalette::ToolTipText + 1, // Qt_4_11 -#if QT_VERSION > 0x041100 +#if QT_VERSION > 0x041101 #error Add the datastream color role for this version QPalette::ToolTipText + 1, // Qt_4_12 #endif