Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

version bump

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-02-08 12:14:41 +02:00
parent 8450198cec
commit 9e8ca35d5e
24 changed files with 113 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -82,9 +82,9 @@ endforeach()
# 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 "9")
set(KATIE_MICRO "2")
set(KATIE_HEX "0x040902")
set(KATIE_MINOR "10")
set(KATIE_MICRO "0")
set(KATIE_HEX "0x041000")
set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")
# only for the build process

2
appveyor.yml
View file

@ -1,4 +1,4 @@
version: 4.9.2-{branch}-{build}
version: 4.10.0-{branch}-{build}
image: Ubuntu2004
clone_depth: 1
services:

4
package/archlinux/PKGBUILD
View file

@ -4,7 +4,7 @@
# https://wiki.archlinux.org/index.php/Arch_package_guidelines
pkgname=katie-git
pkgver=4.9.2.r4681.8f22ea5f
pkgver=4.10.0.r4681.8f22ea5f
pkgrel=1
pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm')
@ -23,7 +23,7 @@ conflicts=('katie')
pkgver() {
cd katie
printf "4.9.2.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
printf "4.10.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
prepare() {

8
package/debian/changelog
View file

@ -1,4 +1,10 @@
katie (4.9.2) unstable; urgency=medium
katie (4.10.0) unstable; urgency=medium
* Fourth package update
-- Ivailo Monev <xakepa10@gmail.com> Mon, 8 Feb 2020 14:44:00 +0200
katie (4.9.2) stable; urgency=medium
* Third package update

2
package/debian/control
View file

@ -4,7 +4,7 @@ Maintainer: Ivailo Monev <xakepa10@gmail.com>
Homepage: https://github.com/fluxer/katie
Vcs-Git: git://github.com/fluxer/katie.git
Vcs-browser: https://github.com/fluxer/katie
Standards-Version: 4.9.2
Standards-Version: 4.10.0
Build-Depends: debhelper (>= 9~), libssl-dev, zlib1g-dev, libzstd-dev,
libc6-dev, libpng-dev, libjpeg-dev, libtiff5-dev, libcups2-dev,
libfreetype6-dev, libfontconfig1-dev, libpcre3-dev, libdbus-1-dev,

5
package/fedora/katie.spec
View file

@ -1,7 +1,7 @@
# https://docs.fedoraproject.org/en-US/packaging-guidelines/
Name: katie
Version: 4.9.2
Version: 4.10.0
Release: 1%{?dist}
Summary: C++ toolkit derived from the Qt 4.8 framework
License: BSD and LGPLv2+
@ -67,6 +67,9 @@ This package includes headers, pkg-config and CMake files.
%{_libdir}/cmake/Katie/*
%changelog
* Mon Feb 8 2020 Ivailo Monev <xakepa10@gmail.com> - 4.10.0-1
- package update
* Mon Dec 21 2020 Ivailo Monev <xakepa10@gmail.com> - 4.9.2-1
- package update

2
package/freebsd/Makefile
View file

@ -3,7 +3,7 @@
# https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/
PORTNAME = katie
DISTVERSION = 4.9.2.d20201231
DISTVERSION = 4.10.0.d20201231
CATEGORIES = devel x11 ftp net www
MAINTAINER = xakepa10@gmail.com
COMMENT = C++ toolkit derived from the Qt 4.8 framework

56
package/freebsd/pkg-plist
View file

@ -1485,47 +1485,47 @@ lib/katie/plugins/sqldrivers/libqsqlodbc.so
%%MYSQL%%lib/katie/plugins/sqldrivers/libqsqlmysql.so
%%PGSQL%%lib/katie/plugins/sqldrivers/libqsqlpsql.so
lib/libKtCore.so
lib/libKtCore.so.4.9
lib/libKtCore.so.4.9.2
lib/libKtCore.so.4.10
lib/libKtCore.so.4.10.0
lib/libKtDBus.so
lib/libKtDBus.so.4.9
lib/libKtDBus.so.4.9.2
lib/libKtDBus.so.4.10
lib/libKtDBus.so.4.10.0
lib/libKtDeclarative.so
lib/libKtDeclarative.so.4.9
lib/libKtDeclarative.so.4.9.2
lib/libKtDeclarative.so.4.10
lib/libKtDeclarative.so.4.10.0
lib/libKtDesigner.so
lib/libKtDesigner.so.4.9
lib/libKtDesigner.so.4.9.2
lib/libKtDesigner.so.4.10
lib/libKtDesigner.so.4.10.0
lib/libKtDesignerComponents.so
lib/libKtDesignerComponents.so.4.9
lib/libKtDesignerComponents.so.4.9.2
lib/libKtDesignerComponents.so.4.10
lib/libKtDesignerComponents.so.4.10.0
lib/libKtGui.so
lib/libKtGui.so.4.9
lib/libKtGui.so.4.9.2
lib/libKtGui.so.4.10
lib/libKtGui.so.4.10.0
lib/libKtNetwork.so
lib/libKtNetwork.so.4.9
lib/libKtNetwork.so.4.9.2
lib/libKtNetwork.so.4.10
lib/libKtNetwork.so.4.10.0
lib/libKtScript.so
lib/libKtScript.so.4.9
lib/libKtScript.so.4.9.2
lib/libKtScript.so.4.10
lib/libKtScript.so.4.10.0
lib/libKtScriptTools.so
lib/libKtScriptTools.so.4.9
lib/libKtScriptTools.so.4.9.2
lib/libKtScriptTools.so.4.10
lib/libKtScriptTools.so.4.10.0
lib/libKtSql.so
lib/libKtSql.so.4.9
lib/libKtSql.so.4.9.2
lib/libKtSql.so.4.10
lib/libKtSql.so.4.10.0
lib/libKtSvg.so
lib/libKtSvg.so.4.9
lib/libKtSvg.so.4.9.2
lib/libKtSvg.so.4.10
lib/libKtSvg.so.4.10.0
lib/libKtTest.so
lib/libKtTest.so.4.9
lib/libKtTest.so.4.9.2
lib/libKtTest.so.4.10
lib/libKtTest.so.4.10.0
lib/libKtUiTools.so
lib/libKtUiTools.so.4.9
lib/libKtUiTools.so.4.9.2
lib/libKtUiTools.so.4.10
lib/libKtUiTools.so.4.10.0
lib/libKtXml.so
lib/libKtXml.so.4.9
lib/libKtXml.so.4.9.2
lib/libKtXml.so.4.10
lib/libKtXml.so.4.10.0
libdata/pkgconfig/KtCore.pc
libdata/pkgconfig/KtDBus.pc
libdata/pkgconfig/KtDeclarative.pc

2
package/netbsd/Makefile
View file

@ -4,7 +4,7 @@
# https://www.netbsd.org/docs/pkgsrc/
DISTNAME = master
PKGNAME = katie-4.9.2.d20201231
PKGNAME = katie-4.10.0.d20201231
CATEGORIES = devel x11 net www
MAINTAINER = xakepa10@gmail.com
COMMENT = C++ toolkit deived from the Qt 4.8 framework

56
package/netbsd/PLIST.common
View file

@ -1488,47 +1488,47 @@ ${PLIST.mysql}lib/katie/plugins/sqldrivers/libqsqlmysql.so
lib/katie/plugins/sqldrivers/libqsqlodbc.so
${PLIST.pgsql}lib/katie/plugins/sqldrivers/libqsqlpsql.so
lib/libKtCore.so
lib/libKtCore.so.4.9
lib/libKtCore.so.4.9.2
lib/libKtCore.so.4.10
lib/libKtCore.so.4.10.0
lib/libKtDBus.so
lib/libKtDBus.so.4.9
lib/libKtDBus.so.4.9.2
lib/libKtDBus.so.4.10
lib/libKtDBus.so.4.10.0
lib/libKtDeclarative.so
lib/libKtDeclarative.so.4.9
lib/libKtDeclarative.so.4.9.2
lib/libKtDeclarative.so.4.10
lib/libKtDeclarative.so.4.10.0
lib/libKtDesigner.so
lib/libKtDesigner.so.4.9
lib/libKtDesigner.so.4.9.2
lib/libKtDesigner.so.4.10
lib/libKtDesigner.so.4.10.0
lib/libKtDesignerComponents.so
lib/libKtDesignerComponents.so.4.9
lib/libKtDesignerComponents.so.4.9.2
lib/libKtDesignerComponents.so.4.10
lib/libKtDesignerComponents.so.4.10.0
lib/libKtGui.so
lib/libKtGui.so.4.9
lib/libKtGui.so.4.9.2
lib/libKtGui.so.4.10
lib/libKtGui.so.4.10.0
lib/libKtNetwork.so
lib/libKtNetwork.so.4.9
lib/libKtNetwork.so.4.9.2
lib/libKtNetwork.so.4.10
lib/libKtNetwork.so.4.10.0
lib/libKtScript.so
lib/libKtScript.so.4.9
lib/libKtScript.so.4.9.2
lib/libKtScript.so.4.10
lib/libKtScript.so.4.10.0
lib/libKtScriptTools.so
lib/libKtScriptTools.so.4.9
lib/libKtScriptTools.so.4.9.2
lib/libKtScriptTools.so.4.10
lib/libKtScriptTools.so.4.10.0
lib/libKtSql.so
lib/libKtSql.so.4.9
lib/libKtSql.so.4.9.2
lib/libKtSql.so.4.10
lib/libKtSql.so.4.10.0
lib/libKtSvg.so
lib/libKtSvg.so.4.9
lib/libKtSvg.so.4.9.2
lib/libKtSvg.so.4.10
lib/libKtSvg.so.4.10.0
lib/libKtTest.so
lib/libKtTest.so.4.9
lib/libKtTest.so.4.9.2
lib/libKtTest.so.4.10
lib/libKtTest.so.4.10.0
lib/libKtUiTools.so
lib/libKtUiTools.so.4.9
lib/libKtUiTools.so.4.9.2
lib/libKtUiTools.so.4.10
lib/libKtUiTools.so.4.10.0
lib/libKtXml.so
lib/libKtXml.so.4.9
lib/libKtXml.so.4.9.2
lib/libKtXml.so.4.10
lib/libKtXml.so.4.10.0
lib/pkgconfig/KtCore.pc
lib/pkgconfig/KtDBus.pc
lib/pkgconfig/KtDeclarative.pc

2
package/netbsd/buildlink3.mk
View file

@ -5,7 +5,7 @@ BUILDLINK_TREE+= katie
.if !defined(KATIE_BUILDLINK3_MK)
KATIE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.katie+= katie>=4.9.2.d20201231
BUILDLINK_API_DEPENDS.katie+= katie>=4.10.0.d20201231
BUILDLINK_PKGSRCDIR.katie?= ../../devel/katie
.endif # KATIE_BUILDLINK3_MK

30
package/openbsd/Makefile
View file

@ -3,7 +3,7 @@
# https://www.openbsd.org/faq/ports/
DISTNAME = katie
PKGNAME = katie-4.9.2.d20201231
PKGNAME = katie-4.10.0.d20201231
CATEGORIES = devel x11 net www
MAINTAINER = Ivailo Monev <xakepa10@gmail.com>
COMMENT = C++ toolkit derived from the Qt 4.8 framework
@ -31,19 +31,19 @@ SEPARATE_BUILD = Yes
CONFIGURE_ARGS = -DKATIE_TOOLS_SUFFIX="-katie"
SHARED_LIBS = \
KtCore 4.9 \
KtDBus 4.9 \
KtDeclarative 4.9 \
KtDesigner 4.9 \
KtDesignerComponents 4.9 \
KtGui 4.9 \
KtNetwork 4.9 \
KtScript 4.9 \
KtScriptTools 4.9 \
KtSql 4.9 \
KtSvg 4.9 \
KtTest 4.9 \
KtUiTools 4.9 \
KtXml 4.9
KtCore 4.10 \
KtDBus 4.10 \
KtDeclarative 4.10 \
KtDesigner 4.10 \
KtDesignerComponents 4.10 \
KtGui 4.10 \
KtNetwork 4.10 \
KtScript 4.10 \
KtScriptTools 4.10 \
KtSql 4.10 \
KtSvg 4.10 \
KtTest 4.10 \
KtUiTools 4.10 \
KtXml 4.10
.include <bsd.port.mk>

2
scripts/genman.py
View file

@ -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.9.2',
'--release=Katie 4.10.0',
'--center=Katie Manual',
'--section=1',
'--utf8',

2
scripts/tarball.sh
View file

@ -4,6 +4,6 @@ set -e
cwd="$(readlink -f $(dirname $0))"
tarball="Katie-4.9.2-Source"
tarball="Katie-4.10.0-Source"
git archive HEAD --format=tar --prefix="$tarball/" | xz > "$cwd/../$tarball.tar.xz"

3
src/core/io/qdatastream.cpp
View file

@ -518,10 +518,11 @@ void QDataStream::setByteOrder(ByteOrder bo)
This enum provides symbolic synonyms for the data serialization
format version numbers.
\value Qt_4_6 Version 12 (Qt 4.6, Qt 4.7, Qt 4.8, Katie 4.9)
\value Qt_4_6 Version 12 (Qt 4.6, Qt 4.7, Qt 4.8, Katie 4.9, Katie 4.10)
\value Qt_4_7 Same as Qt_4_6.
\value Qt_4_8 Same as Qt_4_6.
\value Qt_4_9 Same as Qt_4_6.
\value Qt_4_10 Same as Qt_4_6.
\value Qt_Default
\sa setVersion(), version()

7
src/core/io/qdatastream.h
View file

@ -59,11 +59,12 @@ public:
Qt_4_7 = Qt_4_6,
Qt_4_8 = Qt_4_7,
Qt_4_9 = Qt_4_8,
#if QT_VERSION >= 0x041000
Qt_4_10 = Qt_4_9,
#if QT_VERSION > 0x041000
#error Add the datastream version for this version
Qt_4_10 = Qt_4_9
Qt_4_11 = Qt_4_10
#endif
Qt_Default = Qt_4_9
Qt_Default = Qt_4_10
};
enum ByteOrder {

2
src/tools/moc/moc.1
View file

@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "MOC 1"
.TH MOC 1 "2021-02-05" "Katie 4.9.2" "Katie Manual"
.TH MOC 1 "2021-02-05" "Katie 4.10.0" "Katie Manual"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

2
src/tools/qdbus/qdbus.1
View file

@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "QDBUS 1"
.TH QDBUS 1 "2021-02-05" "Katie 4.9.2" "Katie Manual"
.TH QDBUS 1 "2021-02-05" "Katie 4.10.0" "Katie Manual"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

2
src/tools/qdbus/qdbuscpp2xml.1
View file

@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "QDBUSCPP2XML 1"
.TH QDBUSCPP2XML 1 "2021-02-05" "Katie 4.9.2" "Katie Manual"
.TH QDBUSCPP2XML 1 "2021-02-05" "Katie 4.10.0" "Katie Manual"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

2
src/tools/qdbus/qdbusxml2cpp.1
View file

@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "QDBUSXML2CPP 1"
.TH QDBUSXML2CPP 1 "2021-02-05" "Katie 4.9.2" "Katie Manual"
.TH QDBUSXML2CPP 1 "2021-02-05" "Katie 4.10.0" "Katie Manual"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

2
src/tools/qscript/qscript.1
View file

@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "QSCRIPT 1"
.TH QSCRIPT 1 "2021-02-05" "Katie 4.9.2" "Katie Manual"
.TH QSCRIPT 1 "2021-02-05" "Katie 4.10.0" "Katie Manual"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

2
src/tools/rcc/rcc.1
View file

@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "RCC 1"
.TH RCC 1 "2021-02-05" "Katie 4.9.2" "Katie Manual"
.TH RCC 1 "2021-02-05" "Katie 4.10.0" "Katie Manual"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

2
src/tools/uic/uic.1
View file

@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "UIC 1"
.TH UIC 1 "2021-02-05" "Katie 4.9.2" "Katie Manual"
.TH UIC 1 "2021-02-05" "Katie 4.10.0" "Katie Manual"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

7
tests/auto/qdatastream/tst_qdatastream.cpp
View file

@ -265,7 +265,12 @@ static int NColorRoles[] = {
QPalette::ToolTipText + 1, // Qt_4_7
QPalette::ToolTipText + 1, // Qt_4_8
QPalette::ToolTipText + 1, // Qt_4_9
0 // add the correct value for Qt_4_10 here later
QPalette::ToolTipText + 1, // Qt_4_10
#if QT_VERSION > 0x041000
#error Add the datastream color role for this version
QPalette::ToolTipText + 1, // Qt_4_11
#endif
0 // add the correct value for Qt_4_11 here later
};
// Testing get/set functions