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

effectively revert 6b4f25f6d0 [ci reset]

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-01-31 07:58:56 +02:00
parent 59a99805f3
commit be7f55f7a5
18 changed files with 955 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -472,7 +472,7 @@ if(NOT HAVE_pic)
endif()
# keep in sync with the GUI component CMake file, only definitions setup is needed here
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xpm)
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor)
if(NOT X11_${x11ext}_FOUND)
message(WARNING "The X11 ${x11ext} extension was not found")
string(TOUPPER "${x11ext}" upperext)

2
package/archlinux/PKGBUILD
View file

@ -10,7 +10,7 @@ pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm')
url='https://github.com/fluxer/katie'
license=('LGPL' 'BSD')
depends=('libsm' 'libxcursor' 'libxinerama' 'libxpm' 'libxrandr' 'fontconfig'
depends=('libsm' 'libxcursor' 'libxinerama' 'libxrandr' 'fontconfig'
'icu' 'jansson' 'libcups' 'xdg-utils')
makedepends=('cmake' 'git' 'unifdef')
optdepends=('gnu-free-fonts: last resort font')

2
package/debian/control
View file

@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9~), libssl-dev, zlib1g-dev, libzstd-dev,
libc6-dev, libjansson-dev, libpng-dev, libcups2-dev, libfreetype6-dev,
libfontconfig1-dev, libpcre3-dev, libdbus-1-dev, libicu-dev, cmake,
git, xserver-xorg-dev, libxinerama-dev, libxrandr-dev, libxrender-dev,
libxcursor-dev, libsm-dev, libxpm-dev, unifdef | dpkg
libxcursor-dev, libsm-dev, unifdef | dpkg
Package: katie-runtime
Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x hurd-i386

2
package/freebsd/Makefile
View file

@ -14,7 +14,7 @@ DIST_SUBDIR = ${PORTNAME}
WRKSRC = ${WRKDIR}/katie-master
USES = compiler:c++11-lang pkgconfig cmake ssl xorg desktop-file-utils
USE_XORG = x11 xinerama xrandr xrender xfixes xcursor xext xpm sm ice
USE_XORG = x11 xinerama xrandr xrender xfixes xcursor xext sm ice
USE_LDCONFIG = yes
RUN_DEPENDS = xdg-open:devel/xdg-utils \
${LOCALBASE}/share/fonts/freefont-ttf/FreeSans.ttf:x11-fonts/freefont-ttf

1
package/netbsd/Makefile
View file

@ -39,7 +39,6 @@ BUILD_DEPENDS = unifdef-[0-9]*:../../devel/unifdef
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"

2
package/openbsd/Makefile
View file

@ -24,7 +24,7 @@ RUN_DEPENDS = devel/desktop-file-utils devel/xdg-utils fonts/freefont-ttf
LIB_DEPENDS = archivers/zstd textproc/icu4c devel/jansson devel/pcre \
graphics/png x11/dbus print/cups,-libs devel/gettext,-runtime
WANTLIB = ${COMPILER_LIBCXX} ICE SM X11 Xcursor Xext Xfixes Xinerama Xrandr \
Xrender Xpm fontconfig freetype zstd icui18n icuuc pcre png \
Xrender fontconfig freetype zstd icui18n icuuc pcre png \
dbus-1 cups intl ssl z c crypto m
SEPARATE_BUILD = Yes
CONFIGURE_ARGS = -DKATIE_TOOLS_SUFFIX="-katie" -Wno-dev

5
src/core/global/qconfig.h.cmake
View file

@ -152,7 +152,6 @@
#cmakedefine QT_NO_XRENDER
#cmakedefine QT_NO_XSHAPE
#cmakedefine QT_NO_XSYNC
#cmakedefine QT_NO_XPM
// Misc
#cmakedefine QT_NO_USING_NAMESPACE
@ -443,7 +442,7 @@
#endif
// Drag and drop
#if !defined(QT_NO_DRAGANDDROP) && defined(QT_NO_XPM)
#if !defined(QT_NO_DRAGANDDROP) && defined(QT_NO_IMAGEFORMAT_XPM)
# define QT_NO_DRAGANDDROP
#endif
@ -473,7 +472,7 @@
#endif
// QCleanLooksStyle
#if !defined(QT_NO_STYLE_CLEANLOOKS) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_XPM))
#if !defined(QT_NO_STYLE_CLEANLOOKS) && defined(QT_NO_STYLE_WINDOWS)
# define QT_NO_STYLE_CLEANLOOKS
#endif

2
src/gui/CMakeLists.txt
View file

@ -885,7 +885,7 @@ set(GUI_SOURCES
)
# keep in sync with the top-level CMake file, only libraries setup is needed here
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xpm Xext SM ICE)
foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xext SM ICE)
if(X11_${x11ext}_FOUND AND X11_${x11ext}_LIB)
set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS}

4
src/gui/image/qimage.cpp
View file

@ -808,7 +808,7 @@ QImage::QImage(const char *fileName, const char *format)
}
#endif
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
extern bool qt_read_xpm_array(const char* const *source, QImage &image);
/*!
@ -837,7 +837,7 @@ QImage::QImage(const char * const xpm[])
// Issue: Warning because the constructor may be ambigious
qWarning("QImage::QImage(), XPM is not supported");
}
#endif // QT_NO_XPM
#endif // QT_NO_IMAGEFORMAT_XPM
/*!
\fn QImage::QImage(const QByteArray &data)

2
src/gui/image/qimage.h
View file

@ -63,7 +63,7 @@ public:
QImage(uchar *data, int width, int height, int bytesPerLine, Format format);
QImage(const uchar *data, int width, int height, int bytesPerLine, Format format);
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
explicit QImage(const char * const xpm[]);
#endif
explicit QImage(const QString &fileName, const char *format = nullptr);

6
src/gui/image/qimagereader.cpp
View file

@ -133,7 +133,7 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
// check if we have built-in support for the format first
if (form == "png") {
handler = new QPngHandler;
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
} else if (form == "xpm") {
handler = new QXpmHandler;
#endif
@ -161,7 +161,7 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
if (QPngHandler::canRead(device)) {
handler = new QPngHandler;
}
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
if (!handler && QXpmHandler::canRead(device)) {
handler = new QXpmHandler;
}
@ -1076,7 +1076,7 @@ QList<QByteArray> QImageReader::supportedImageFormats()
#ifndef QT_NO_IMAGEFORMAT_PPM
<< "ppm" << "pbm"
#endif
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
<< "xpm"
#endif
;

9
src/gui/image/qpixmap.cpp
View file

@ -247,7 +247,7 @@ QPixmap::QPixmap(const QPixmap &pixmap)
slightly more efficient (for example, when the code is in a shared
library) and ROMable when the application is to be stored in ROM.
*/
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
QPixmap::QPixmap(const char * const xpm[])
: QPaintDevice()
{
@ -1304,13 +1304,6 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
return transformed(QTransform(matrix), mode);
}
/*!
\class QPixmap

2
src/gui/image/qpixmap.h
View file

@ -50,7 +50,7 @@ public:
QPixmap(int w, int h);
QPixmap(const QSize &);
QPixmap(const QString& fileName, const char *format = nullptr, Qt::ImageConversionFlags flags = Qt::AutoColor);
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
QPixmap(const char * const xpm[]);
#endif
QPixmap(const QPixmap &);

1032
src/gui/image/qxpmhandler.cpp
View file

File diff suppressed because it is too large Load diff

20
src/gui/image/qxpmhandler_p.h
View file

@ -34,7 +34,7 @@
#include "QtGui/qimageiohandler.h"
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
QT_BEGIN_NAMESPACE
@ -48,10 +48,26 @@ public:
static bool canRead(QIODevice *device);
QByteArray name() const;
private:
bool readHeader();
enum State {
Ready,
ReadHeader,
Error
};
State state;
int width;
int height;
int ncols;
int cpp;
QByteArray buffer;
int index;
QString fileName;
};
QT_END_NAMESPACE
#endif // QT_NO_XPM
#endif // QT_NO_IMAGEFORMAT_XPM
#endif // QXPMHANDLER_P_H

4
src/gui/kernel/qt_x11_p.h
View file

@ -92,10 +92,6 @@
# include <X11/extensions/Xfixes.h>
#endif // QT_NO_XFIXES
#ifndef QT_NO_XPM
# include <X11/xpm.h>
#endif // QT_NO_XPM
#ifndef QT_NO_SESSIONMANAGER
# include <X11/SM/SMlib.h>
#endif // QT_NO_SESSIONMANAGER

4
src/gui/kernel/qwhatsthis.cpp
View file

@ -308,6 +308,7 @@ void QWhatsThat::paintEvent(QPaintEvent*)
}
}
#ifndef QT_NO_IMAGEFORMAT_XPM
/* XPM */
static const char * const button_image[] = {
"16 16 3 1",
@ -330,6 +331,7 @@ static const char * const button_image[] = {
" ooo ",
" ooo ",
" ooo "};
#endif // QT_NO_IMAGEFORMAT_XPM
class QWhatsThisPrivate : public QObject
{
@ -460,7 +462,7 @@ private slots:
QWhatsThisAction::QWhatsThisAction(QObject *parent) : QAction(tr("What's This?"), parent)
{
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
QPixmap p((const char**)button_image);
setIcon(p);
#endif

4
src/gui/styles/qcleanlooksstyle.cpp
View file

@ -4297,7 +4297,7 @@ QPixmap QCleanlooksStyle::standardPixmap(StandardPixmap standardPixmap, const QS
{
QPixmap pixmap;
#ifndef QT_NO_XPM
#ifndef QT_NO_IMAGEFORMAT_XPM
switch (standardPixmap) {
case SP_TitleBarNormalButton:
return QPixmap((const char **)qt_cleanlooks_dock_widget_restore_xpm);
@ -4310,7 +4310,7 @@ QPixmap QCleanlooksStyle::standardPixmap(StandardPixmap standardPixmap, const QS
default:
break;
}
#endif //QT_NO_XPM
#endif // QT_NO_IMAGEFORMAT_XPM
return QWindowsStyle::standardPixmap(standardPixmap, opt, widget);
}