From ab69de5fa36b94c60fea8bdecbe57fb62964943c47e1f07e7e9f3ceba075939d Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 13 Jun 2013 15:41:52 +0000 Subject: [PATCH] - Update to 1.7: * add --wrap option to wrap long lines * fix tab output in plain text mode - Fix license specification. - Regenerate moc_mydialog.cpp to cater for changing Qt versions. - Pass RPM_OPT_FLAGS to compiler and do not use processor specific flags (-march -mtune): ansifilter-compiler_flags.patch OBS-URL: https://build.opensuse.org/package/show/devel:tools/ansifilter?expand=0&rev=5 --- ansifilter-1.6.tar.bz2 | 3 - ansifilter-1.7.tar.bz2 | 3 + ansifilter-compiler_flags.patch | 369 ++++++++++++++++++++++++++++++++ ansifilter.changes | 13 ++ ansifilter.spec | 28 ++- 5 files changed, 397 insertions(+), 19 deletions(-) delete mode 100644 ansifilter-1.6.tar.bz2 create mode 100644 ansifilter-1.7.tar.bz2 create mode 100644 ansifilter-compiler_flags.patch diff --git a/ansifilter-1.6.tar.bz2 b/ansifilter-1.6.tar.bz2 deleted file mode 100644 index 63db05b..0000000 --- a/ansifilter-1.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a704438f6b93b9695e6f15c17df189a1a343dc65678a0a16fdf521a53e91c52 -size 50449 diff --git a/ansifilter-1.7.tar.bz2 b/ansifilter-1.7.tar.bz2 new file mode 100644 index 0000000..b54a9d1 --- /dev/null +++ b/ansifilter-1.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c +size 133803 diff --git a/ansifilter-compiler_flags.patch b/ansifilter-compiler_flags.patch new file mode 100644 index 0000000..896d136 --- /dev/null +++ b/ansifilter-compiler_flags.patch @@ -0,0 +1,369 @@ +--- + src/makefile | 2 + src/qt-gui/Makefile | 346 ---------------------------------------------------- + 2 files changed, 1 insertion(+), 347 deletions(-) + +Index: src/makefile +=================================================================== +--- src/makefile.orig 2012-01-04 16:17:59.000000000 +0100 ++++ src/makefile 2013-06-13 17:35:22.374397915 +0200 +@@ -4,7 +4,7 @@ + + CC=g++ + +-CFLAGS= -c -Wall -O2 ++CFLAGS=$(RPM_OPT_FLAGS) -c -Wall -O2 + + LDFLAGS= + +Index: src/qt-gui/Makefile +=================================================================== +--- src/qt-gui/Makefile 2013-06-13 17:35:22.375397892 +0200 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,346 +0,0 @@ +-############################################################################# +-# Makefile for building: ansifilter-gui +-# Generated by qmake (2.01a) (Qt 4.7.4) on: Mi. Jan 4 19:11:18 2012 +-# Project: ansifilter-gui.pro +-# Template: app +-# Command: /usr/bin/qmake -o Makefile ansifilter-gui.pro +-############################################################################# +- +-####### Compiler, tools and options +- +-CC = gcc +-CXX = g++ +-DEFINES = -DO2 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED +-CFLAGS = -m64 -pipe -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing -Wall -W -D_REENTRANT $(DEFINES) +-CXXFLAGS = -m64 -pipe -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing -Wall -W -D_REENTRANT $(DEFINES) +-INCPATH = -I/usr/share/qt/mkspecs/linux-g++-64 -I. -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include -I. -I.. -I. -I. +-LINK = g++ +-LFLAGS = -m64 -Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu -Wl,-O1 +-LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread +-AR = ar cqs +-RANLIB = +-QMAKE = /usr/bin/qmake +-TAR = tar -cf +-COMPRESS = gzip -9f +-COPY = cp -f +-SED = sed +-COPY_FILE = $(COPY) +-COPY_DIR = $(COPY) -r +-STRIP = strip +-INSTALL_FILE = install -m 644 -p +-INSTALL_DIR = $(COPY_DIR) +-INSTALL_PROGRAM = install -m 755 -p +-DEL_FILE = rm -f +-SYMLINK = ln -f -s +-DEL_DIR = rmdir +-MOVE = mv -f +-CHK_DIR_EXISTS= test -d +-MKDIR = mkdir -p +- +-####### Output directory +- +-OBJECTS_DIR = ./ +- +-####### Files +- +-SOURCES = main.cpp \ +- mydialog.cpp \ +- ../elementstyle.cpp \ +- ../plaintextgenerator.cpp \ +- ../codegenerator.cpp \ +- ../platform_fs.cpp \ +- ../rtfgenerator.cpp \ +- ../htmlgenerator.cpp \ +- ../texgenerator.cpp \ +- ../latexgenerator.cpp \ +- ../bbcodegenerator.cpp \ +- ../stringtools.cpp \ +- ../stylecolour.cpp \ +- ../preformatter.cpp moc_mydialog.cpp +-OBJECTS = main.o \ +- mydialog.o \ +- elementstyle.o \ +- plaintextgenerator.o \ +- codegenerator.o \ +- platform_fs.o \ +- rtfgenerator.o \ +- htmlgenerator.o \ +- texgenerator.o \ +- latexgenerator.o \ +- bbcodegenerator.o \ +- stringtools.o \ +- stylecolour.o \ +- preformatter.o \ +- moc_mydialog.o +-DIST = /usr/share/qt/mkspecs/common/g++.conf \ +- /usr/share/qt/mkspecs/common/unix.conf \ +- /usr/share/qt/mkspecs/common/linux.conf \ +- /usr/share/qt/mkspecs/qconfig.pri \ +- /usr/share/qt/mkspecs/modules/qt_phonon.pri \ +- /usr/share/qt/mkspecs/modules/qt_webkit_version.pri \ +- /usr/share/qt/mkspecs/features/qt_functions.prf \ +- /usr/share/qt/mkspecs/features/qt_config.prf \ +- /usr/share/qt/mkspecs/features/exclusive_builds.prf \ +- /usr/share/qt/mkspecs/features/default_pre.prf \ +- /usr/share/qt/mkspecs/features/release.prf \ +- /usr/share/qt/mkspecs/features/default_post.prf \ +- /usr/share/qt/mkspecs/features/warn_on.prf \ +- /usr/share/qt/mkspecs/features/qt.prf \ +- /usr/share/qt/mkspecs/features/unix/thread.prf \ +- /usr/share/qt/mkspecs/features/moc.prf \ +- /usr/share/qt/mkspecs/features/resources.prf \ +- /usr/share/qt/mkspecs/features/uic.prf \ +- /usr/share/qt/mkspecs/features/yacc.prf \ +- /usr/share/qt/mkspecs/features/lex.prf \ +- /usr/share/qt/mkspecs/features/include_source_dir.prf \ +- ansifilter-gui.pro +-QMAKE_TARGET = ansifilter-gui +-DESTDIR = +-TARGET = ansifilter-gui +- +-first: all +-####### Implicit rules +- +-.SUFFIXES: .o .c .cpp .cc .cxx .C +- +-.cpp.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" +- +-.cc.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" +- +-.cxx.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" +- +-.C.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" +- +-.c.o: +- $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" +- +-####### Build rules +- +-all: Makefile $(TARGET) +- +-$(TARGET): ui_ansifilter.h $(OBJECTS) +- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) +- +-Makefile: ansifilter-gui.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/qt/mkspecs/common/g++.conf \ +- /usr/share/qt/mkspecs/common/unix.conf \ +- /usr/share/qt/mkspecs/common/linux.conf \ +- /usr/share/qt/mkspecs/qconfig.pri \ +- /usr/share/qt/mkspecs/modules/qt_phonon.pri \ +- /usr/share/qt/mkspecs/modules/qt_webkit_version.pri \ +- /usr/share/qt/mkspecs/features/qt_functions.prf \ +- /usr/share/qt/mkspecs/features/qt_config.prf \ +- /usr/share/qt/mkspecs/features/exclusive_builds.prf \ +- /usr/share/qt/mkspecs/features/default_pre.prf \ +- /usr/share/qt/mkspecs/features/release.prf \ +- /usr/share/qt/mkspecs/features/default_post.prf \ +- /usr/share/qt/mkspecs/features/warn_on.prf \ +- /usr/share/qt/mkspecs/features/qt.prf \ +- /usr/share/qt/mkspecs/features/unix/thread.prf \ +- /usr/share/qt/mkspecs/features/moc.prf \ +- /usr/share/qt/mkspecs/features/resources.prf \ +- /usr/share/qt/mkspecs/features/uic.prf \ +- /usr/share/qt/mkspecs/features/yacc.prf \ +- /usr/share/qt/mkspecs/features/lex.prf \ +- /usr/share/qt/mkspecs/features/include_source_dir.prf \ +- /usr/lib/libQtGui.prl \ +- /usr/lib/libQtCore.prl +- $(QMAKE) -o Makefile ansifilter-gui.pro +-/usr/share/qt/mkspecs/common/g++.conf: +-/usr/share/qt/mkspecs/common/unix.conf: +-/usr/share/qt/mkspecs/common/linux.conf: +-/usr/share/qt/mkspecs/qconfig.pri: +-/usr/share/qt/mkspecs/modules/qt_phonon.pri: +-/usr/share/qt/mkspecs/modules/qt_webkit_version.pri: +-/usr/share/qt/mkspecs/features/qt_functions.prf: +-/usr/share/qt/mkspecs/features/qt_config.prf: +-/usr/share/qt/mkspecs/features/exclusive_builds.prf: +-/usr/share/qt/mkspecs/features/default_pre.prf: +-/usr/share/qt/mkspecs/features/release.prf: +-/usr/share/qt/mkspecs/features/default_post.prf: +-/usr/share/qt/mkspecs/features/warn_on.prf: +-/usr/share/qt/mkspecs/features/qt.prf: +-/usr/share/qt/mkspecs/features/unix/thread.prf: +-/usr/share/qt/mkspecs/features/moc.prf: +-/usr/share/qt/mkspecs/features/resources.prf: +-/usr/share/qt/mkspecs/features/uic.prf: +-/usr/share/qt/mkspecs/features/yacc.prf: +-/usr/share/qt/mkspecs/features/lex.prf: +-/usr/share/qt/mkspecs/features/include_source_dir.prf: +-/usr/lib/libQtGui.prl: +-/usr/lib/libQtCore.prl: +-qmake: FORCE +- @$(QMAKE) -o Makefile ansifilter-gui.pro +- +-dist: +- @$(CHK_DIR_EXISTS) .tmp/ansifilter-gui1.0.0 || $(MKDIR) .tmp/ansifilter-gui1.0.0 +- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents mydialog.h .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents main.cpp mydialog.cpp ../elementstyle.cpp ../plaintextgenerator.cpp ../codegenerator.cpp ../platform_fs.cpp ../rtfgenerator.cpp ../htmlgenerator.cpp ../texgenerator.cpp ../latexgenerator.cpp ../bbcodegenerator.cpp ../stringtools.cpp ../stylecolour.cpp ../preformatter.cpp .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents ansifilter.ui .tmp/ansifilter-gui1.0.0/ && (cd `dirname .tmp/ansifilter-gui1.0.0` && $(TAR) ansifilter-gui1.0.0.tar ansifilter-gui1.0.0 && $(COMPRESS) ansifilter-gui1.0.0.tar) && $(MOVE) `dirname .tmp/ansifilter-gui1.0.0`/ansifilter-gui1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ansifilter-gui1.0.0 +- +- +-clean:compiler_clean +- -$(DEL_FILE) $(OBJECTS) +- -$(DEL_FILE) *~ core *.core +- +- +-####### Sub-libraries +- +-distclean: clean +- -$(DEL_FILE) $(TARGET) +- -$(DEL_FILE) Makefile +- +- +-check: first +- +-mocclean: compiler_moc_header_clean compiler_moc_source_clean +- +-mocables: compiler_moc_header_make_all compiler_moc_source_make_all +- +-compiler_moc_header_make_all: moc_mydialog.cpp +-compiler_moc_header_clean: +- -$(DEL_FILE) moc_mydialog.cpp +-moc_mydialog.cpp: ui_ansifilter.h \ +- mydialog.h +- /usr/bin/moc $(DEFINES) $(INCPATH) mydialog.h -o moc_mydialog.cpp +- +-compiler_rcc_make_all: +-compiler_rcc_clean: +-compiler_image_collection_make_all: qmake_image_collection.cpp +-compiler_image_collection_clean: +- -$(DEL_FILE) qmake_image_collection.cpp +-compiler_moc_source_make_all: +-compiler_moc_source_clean: +-compiler_uic_make_all: ui_ansifilter.h +-compiler_uic_clean: +- -$(DEL_FILE) ui_ansifilter.h +-ui_ansifilter.h: ansifilter.ui +- /usr/bin/uic ansifilter.ui -o ui_ansifilter.h +- +-compiler_yacc_decl_make_all: +-compiler_yacc_decl_clean: +-compiler_yacc_impl_make_all: +-compiler_yacc_impl_clean: +-compiler_lex_make_all: +-compiler_lex_clean: +-compiler_clean: compiler_moc_header_clean compiler_uic_clean +- +-####### Compile +- +-main.o: main.cpp mydialog.h \ +- ui_ansifilter.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp +- +-mydialog.o: mydialog.cpp mydialog.h \ +- ui_ansifilter.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mydialog.o mydialog.cpp +- +-elementstyle.o: ../elementstyle.cpp ../elementstyle.h \ +- ../stylecolour.h \ +- ../enums.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o elementstyle.o ../elementstyle.cpp +- +-plaintextgenerator.o: ../plaintextgenerator.cpp ../plaintextgenerator.h \ +- ../codegenerator.h \ +- ../elementstyle.h \ +- ../stylecolour.h \ +- ../enums.h \ +- ../preformatter.h \ +- ../stringtools.h \ +- ../version.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o plaintextgenerator.o ../plaintextgenerator.cpp +- +-codegenerator.o: ../codegenerator.cpp ../codegenerator.h \ +- ../elementstyle.h \ +- ../stylecolour.h \ +- ../enums.h \ +- ../preformatter.h \ +- ../stringtools.h \ +- ../version.h \ +- ../htmlgenerator.h \ +- ../rtfgenerator.h \ +- ../plaintextgenerator.h \ +- ../texgenerator.h \ +- ../latexgenerator.h \ +- ../bbcodegenerator.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o codegenerator.o ../codegenerator.cpp +- +-platform_fs.o: ../platform_fs.cpp ../platform_fs.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o platform_fs.o ../platform_fs.cpp +- +-rtfgenerator.o: ../rtfgenerator.cpp ../charcodes.h \ +- ../version.h \ +- ../rtfgenerator.h \ +- ../codegenerator.h \ +- ../elementstyle.h \ +- ../stylecolour.h \ +- ../enums.h \ +- ../preformatter.h \ +- ../stringtools.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o rtfgenerator.o ../rtfgenerator.cpp +- +-htmlgenerator.o: ../htmlgenerator.cpp ../htmlgenerator.h \ +- ../codegenerator.h \ +- ../elementstyle.h \ +- ../stylecolour.h \ +- ../enums.h \ +- ../preformatter.h \ +- ../stringtools.h \ +- ../version.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o htmlgenerator.o ../htmlgenerator.cpp +- +-texgenerator.o: ../texgenerator.cpp ../texgenerator.h \ +- ../codegenerator.h \ +- ../elementstyle.h \ +- ../stylecolour.h \ +- ../enums.h \ +- ../preformatter.h \ +- ../stringtools.h \ +- ../charcodes.h \ +- ../version.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o texgenerator.o ../texgenerator.cpp +- +-latexgenerator.o: ../latexgenerator.cpp ../latexgenerator.h \ +- ../codegenerator.h \ +- ../elementstyle.h \ +- ../stylecolour.h \ +- ../enums.h \ +- ../preformatter.h \ +- ../stringtools.h \ +- ../version.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o latexgenerator.o ../latexgenerator.cpp +- +-bbcodegenerator.o: ../bbcodegenerator.cpp ../bbcodegenerator.h \ +- ../codegenerator.h \ +- ../elementstyle.h \ +- ../stylecolour.h \ +- ../enums.h \ +- ../preformatter.h \ +- ../stringtools.h \ +- ../version.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o bbcodegenerator.o ../bbcodegenerator.cpp +- +-stringtools.o: ../stringtools.cpp ../stringtools.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o stringtools.o ../stringtools.cpp +- +-stylecolour.o: ../stylecolour.cpp ../stylecolour.h \ +- ../enums.h \ +- ../stringtools.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o stylecolour.o ../stylecolour.cpp +- +-preformatter.o: ../preformatter.cpp ../preformatter.h \ +- ../stringtools.h +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o preformatter.o ../preformatter.cpp +- +-moc_mydialog.o: moc_mydialog.cpp +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mydialog.o moc_mydialog.cpp +- +-####### Install +- +-install: FORCE +- +-uninstall: FORCE +- +-FORCE: +- diff --git a/ansifilter.changes b/ansifilter.changes index e7744bb..bb94959 100644 --- a/ansifilter.changes +++ b/ansifilter.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jun 13 17:07:02 CEST 2013 - pth@suse.de + +- Update to 1.7: + * add --wrap option to wrap long lines + * fix tab output in plain text mode + +- Fix license specification. +- Regenerate moc_mydialog.cpp to cater for changing Qt versions. +- Pass RPM_OPT_FLAGS to compiler and do not use processor specific + flags (-march -mtune): + ansifilter-compiler_flags.patch + ------------------------------------------------------------------- Thu Mar 31 15:54:51 UTC 2011 - pascal.bleser@opensuse.org diff --git a/ansifilter.spec b/ansifilter.spec index 7848cdc..938da13 100644 --- a/ansifilter.spec +++ b/ansifilter.spec @@ -7,14 +7,15 @@ %endif Name: ansifilter -Version: 1.6 +Version: 1.7 Release: 0 Summary: ANSI Terminal Escape Code Converter Source: http://www.andre-simon.de/zip/ansifilter-%{version}.tar.bz2 Source1: ansifilter.desktop +Patch0: ansifilter-compiler_flags.patch URL: http://www.andre-simon.de/ Group: Development/Tools/Other -License: GNU General Public License version 3 (GPL v3) +License: GPL-3.0 BuildRoot: %{_tmppath}/build-%{name}-%{version} BuildRequires: gcc-c++ libstdc++-devel pkgconfig BuildRequires: gcc make glibc-devel @@ -29,13 +30,6 @@ Ansifilter handles text files containing ANSI terminal escape codes. The command sequences may be stripped or be interpreted to generate formatted output (HTML, RTF, TeX, LaTeX). - - - -Authors: --------- - Andre Simon - %if %with_gui %package gui Summary: ANSI Terminal Escape Code Converter @@ -48,21 +42,23 @@ The command sequences may be stripped or be interpreted to generate formatted output (HTML, RTF, TeX, LaTeX). This package provides a Qt4 Graphical User Interface to run %{name}. - - - - -Authors: --------- - Andre Simon %endif %prep %setup -q -n ansifilter +%patch0 convert src/qt-gui/ansifilter.{ico,png} +rm -rf src/.svn %build +export RPM_OPT_FLAGS +%if %with_gui +moc -osrc/qt-gui/moc_mydialog.cpp src/qt-gui/mydialog.h +%endif + + %__make %{?jobs:-j%{jobs}} \ + CFLAGS"%{optflags}" \ QMAKE="%{_usr}/bin/qmake" \ PREFIX="%{_prefix}" \ man_dir="%{_mandir}/man1" \