Hello community, here is the log from the commit of package screen-message for openSUSE:Factory checked in at 2019-09-30 15:59:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screen-message (Old) and /work/SRC/openSUSE:Factory/.screen-message.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "screen-message" Mon Sep 30 15:59:46 2019 rev:2 rq:733873 version:0.25 Changes: -------- --- /work/SRC/openSUSE:Factory/screen-message/screen-message.changes 2017-02-16 16:51:55.375424997 +0100 +++ /work/SRC/openSUSE:Factory/.screen-message.new.2352/screen-message.changes 2019-09-30 15:59:50.989144632 +0200 @@ -1,0 +2,10 @@ +Sat Sep 28 09:02:24 UTC 2019 - Sebastian Wagner <[email protected]> + +- Update to version 0.25: + * No upsteam changelog available, from debian changelog: + * Repository location switched to github + * Support -i and Ctrl-I (Closes: #862056) +- Remove _service file, git.nomeata.de is unreachable. +- Add my_gdk_rgba_parse_void.patch to fix compilation error + +------------------------------------------------------------------- Old: ---- _service screen-message-0.23.tar.gz New: ---- my_gdk_rgba_parse_void.patch screen-message-0.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screen-message.spec ++++++ --- /var/tmp/diff_new_pack.3k9uIX/_old 2019-09-30 15:59:51.701142737 +0200 +++ /var/tmp/diff_new_pack.3k9uIX/_new 2019-09-30 15:59:51.701142737 +0200 @@ -1,7 +1,7 @@ # # spec file for package screen-message # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: screen-message -Version: 0.23 +Version: 0.25 Release: 0 Summary: Displays a short text fullscreen -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/X11/Utilities -Url: http://darcs.nomeata.de/screen-message.debian -Source: %{name}-%{version}.tar.gz +URL: https://www.joachim-breitner.de/en/projects#screen-message +Source: https://www.joachim-breitner.de/archive/screen-message/%{name}-%{version}.tar.gz Patch0: inst-dir.patch +# PATCH-FIX-UPSTREAM my_gdk_rgba_parse_void.patch -- fix return value of function +Patch1: my_gdk_rgba_parse_void.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gtk3-devel BuildRequires: pango-devel BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Screen Message is a small program to display a text as large as possible on your screen. You can edit the text while Screen Message is running. To blank the text, press Esc. To quit Screen Message, press Ctrl-Q or press Esc twice. @@ -38,12 +39,12 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf --install %configure --bindir=%{_bindir} mv README.Win32 README -mv debian/changelog ChangeLog make %{?_smp_mflags} %install @@ -59,11 +60,10 @@ %icon_theme_cache_postun %files -%defattr(-,root,root) -%doc README ChangeLog +%doc README %{_bindir}/sm %{_datadir}/applications/sm.desktop %{_datadir}/icons/hicolor/48x48/apps/sm.png -%{_mandir}/man6/sm.6%{ext_man} +%{_mandir}/man6/sm.6%{?ext_man} %changelog ++++++ my_gdk_rgba_parse_void.patch ++++++ --- screen-message-0.25/sm.c.back 2019-09-28 14:16:10.431541670 +0200 +++ screen-message-0.25/sm.c 2019-09-28 14:16:46.543670556 +0200 @@ -281,7 +281,7 @@ printf("%s\n", PACKAGE_STRING); } -gboolean my_gdk_rgba_parse (GdkRGBA *rgba, const gchar *spec) { +static void my_gdk_rgba_parse (GdkRGBA *rgba, const gchar *spec) { gboolean ret = gdk_rgba_parse(rgba, spec); if (!ret) { fprintf (stderr, "Failed to parse color specification %s\n", spec); ++++++ screen-message-0.23.tar.gz -> screen-message-0.25.tar.gz ++++++ ++++ 10852 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/README.Win32 new/screen-message-0.25/README.Win32 --- old/screen-message-0.23/README.Win32 1970-01-01 01:00:00.000000000 +0100 +++ new/screen-message-0.25/README.Win32 2017-05-09 14:16:24.000000000 +0200 @@ -0,0 +1,32 @@ +Screen Message 0.25 + +(c) 2009 Joachim Breitner <[email protected]> + +Screen Message is a small program to display a text as large as possible on your screen. You can edit the text while Screen Message is running. + +To blank the text, press Esc. To quit Screen Message, press Ctrl-Q or press Esc twice. + +License Information +=================== + +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 of the License, 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 can find a COPY of the GNU General Public License in the file LICENSE after setup is finished in the installation directory. + +Third party components +====================== + +This program uses and ships the following components from Free Software projects. You can find the source code at the respective websites: + + * GTK+, ATK, Pango, GLib: http://www.gtk.org/ + * Cairo: http://cairographics.org/ + * Expat: http://expat.sourceforge.net/ + * Fontconfig: http://www.fontconfig.org/ + * Freetype2: http://www.freetype.org/ + * libpng: http://www.libpng.org/pub/png/libpng.html + * zlib: http://www.zlib.net/ + +This installer was created using Inno Setup: http://www.jrsoftware.org/isinfo.php + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/compile new/screen-message-0.25/compile --- old/screen-message-0.23/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/screen-message-0.25/compile 2017-05-09 14:04:29.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# 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, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/config.h.in new/screen-message-0.25/config.h.in --- old/screen-message-0.23/config.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/screen-message-0.25/config.h.in 2017-05-09 14:16:24.000000000 +0200 @@ -0,0 +1,28 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/configure.ac new/screen-message-0.25/configure.ac --- old/screen-message-0.23/configure.ac 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/configure.ac 2017-05-09 14:06:39.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(screen-message, 0.23, [email protected]) +AC_INIT(screen-message, 0.25, [email protected]) AC_CONFIG_SRCDIR([sm.c]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_FILES([setup.iss README.Win32]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/debian/changelog new/screen-message-0.25/debian/changelog --- old/screen-message-0.23/debian/changelog 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/debian/changelog 1970-01-01 01:00:00.000000000 +0100 @@ -1,211 +0,0 @@ -screen-message (0.23-1) unstable; urgency=medium - - * New upstream release: - - Disable temporary disabling of anti-aliasing - - It seems to have stopped working with recent versions of gtk3, and - furthermore causes every second keypress to be ignored. - - -- Joachim Breitner <[email protected]> Tue, 23 Dec 2014 19:41:09 +0100 - -screen-message (0.22.2-1) unstable; urgency=medium - - * New upstream release (Closes: 763429) - - -- Joachim Breitner <[email protected]> Tue, 30 Sep 2014 15:48:32 +0200 - -screen-message (0.22.1-2) unstable; urgency=medium - - * New minor upstream release (fixes sm.desktop), thanks to Sebastian Pipping - for the patch. - - -- Joachim Breitner <[email protected]> Fri, 30 May 2014 10:21:26 +0200 - -screen-message (0.22-1) unstable; urgency=medium - - * New minor upstream release - - -- Joachim Breitner <[email protected]> Thu, 22 May 2014 23:54:38 +0200 - -screen-message (0.21-2) unstable; urgency=medium - - * Fix build-depends (Closes: #747772) - - -- Joachim Breitner <[email protected]> Mon, 12 May 2014 16:18:31 +0200 - -screen-message (0.21-1) unstable; urgency=medium - - * New upstream release (use stock gtk fullscreen functionality) - - -- Joachim Breitner <[email protected]> Fri, 09 May 2014 09:45:46 +0200 - -screen-message (0.20-2) unstable; urgency=low - - * Upload to unstable - - -- Joachim Breitner <[email protected]> Mon, 20 May 2013 12:11:24 +0200 - -screen-message (0.20-1) experimental; urgency=low - - * Adjust VCS header - * New upstream release - - -- Joachim Breitner <[email protected]> Sat, 24 Nov 2012 20:28:14 +0100 - -screen-message (0.19-1) unstable; urgency=low - - * New upstream release - + Fixes SIGSEGV by not using g_object_set (Closes: #581337) - * Switch to 3.0 (quilt) source format - * Bump standards version, no change. - - -- Joachim Breitner <[email protected]> Mon, 17 May 2010 18:13:34 +0200 - -screen-message (0.18-1) unstable; urgency=low - - * New upstream release - + Does not focus the hidden text input, avoiding unwanted pop-ups of - a possible virtual keyboard. - + Ship .desktop file - - -- Joachim Breitner <[email protected]> Fri, 24 Jul 2009 12:46:27 +0200 - -screen-message (0.17-1) unstable; urgency=low - - * New upstream release - + Properly hide entry when no data is provided - * Bump standards version, no change - - -- Joachim Breitner <[email protected]> Mon, 20 Jul 2009 23:44:46 +0200 - -screen-message (0.16-1) unstable; urgency=low - - * New upstream release - + 3 second timeout, react on cursor movements (Closes: #496467), thanks to - Paul Wise for the patch. - + Avoid flicker when toggling the entry. - - -- Joachim Breitner <[email protected]> Thu, 27 Nov 2008 14:37:00 +0100 - -screen-message (0.15-1) unstable; urgency=low - - * New upstream release - + Back to using a GtkDraw for the text, behaves better with matchbox - + Show mouse pointer while entry is visible - - -- Joachim Breitner <[email protected]> Sat, 23 Aug 2008 23:50:10 +0200 - -screen-message (0.14-1) unstable; urgency=low - - * New upstream release - + Only show entry from start on when nothing is provided - + Redraw screen on screen configuration changes - - -- Joachim Breitner <[email protected]> Sat, 16 Aug 2008 16:07:25 -0300 - -screen-message (0.13-1) unstable; urgency=low - - * New upstream release - + Floats and auto-hides text entry - + Ignore trailing newlines on stdin (Closes: 494771), thanks - to Chris Lamb for the patch. - * Bump standards version, no change - - -- Joachim Breitner <[email protected]> Tue, 12 Aug 2008 01:35:39 -0300 - -screen-message (0.12-1) unstable; urgency=low - - * New upstream release - + --foreground, --background, --font, thx to Rhonda - Closes: #432804 - + --rotate [0|1|2|3] for rotation - - -- Joachim Breitner <[email protected]> Tue, 05 Aug 2008 19:39:46 -0300 - -screen-message (0.11-1) unstable; urgency=low - - * New upstream version - + Manpage in section 6 (Closes: 476600 ) - + Binary moved in "upstream" source - - -- Joachim Breitner <[email protected]> Thu, 17 Apr 2008 23:39:57 +0200 - -screen-message (0.10-1) unstable; urgency=low - - * New upstream version - + Includes an icon - * Move binary to /usr/games - - -- Joachim Breitner <[email protected]> Thu, 20 Mar 2008 14:15:49 +0100 - -screen-message (0.9-1) unstable; urgency=low - - * New upstream Version: - - Starts with text selected - * add XS-Vcs-Browser header - - -- Joachim Breitner <[email protected]> Wed, 24 Oct 2007 00:53:43 +0200 - -screen-message (0.8-1) unstable; urgency=low - - * New upstream Version - + Make the initial text size the same as normal text - + Pressing Esc when there is no text quits the program - (Both changes thanks to Paul Wise) - * Bump debhelper dependency - - -- Joachim Breitner <[email protected]> Mon, 22 Oct 2007 17:53:30 +0200 - -screen-message (0.7-1) unstable; urgency=low - - * New upstream version: - + Fixes: only first argument is used as the text (Closes: #432806) - Thanks to Florian Ragwitz for the patch. - + Sets the size to the size of the screen. This makes fullscren - work with xmonad, please tell me if it causes problems with other - WMs. - - -- Joachim Breitner <[email protected]> Sun, 21 Oct 2007 21:19:41 +0200 - -screen-message (0.6-1) unstable; urgency=low - - * New upstream release: - * Read from stdin if parameter is - (Closes: #429646) - * Middle-Clicking anywhere works (Closes: #429648) - * End program upon destory (Closes: 428893) - * Fix colors to black/white independent of the theme - - -- Joachim Breitner <[email protected]> Tue, 19 Jun 2007 13:19:51 +0100 - -screen-message (0.5-1) unstable; urgency=low - - * rename to screen-message, as there ∃ sm in Debian - - -- Joachim Breitner <[email protected]> Thu, 14 Jun 2007 20:21:20 +0100 - -sm (0.4-1) unstable; urgency=low - - * New upstream version (automakized) - * Switched to cdbs - - -- Joachim Breitner <[email protected]> Thu, 14 Jun 2007 18:07:53 +0100 - -sm (0.3-1) unstable; urgency=low - - * Get rid of a warning (thx to Jérémy Bobbio <[email protected]>) - * Automake the whole thing - - -- Joachim Breitner <[email protected]> Thu, 14 Jun 2007 16:51:22 +0100 - -sm (0.2-1) unstable; urgency=low - - * Version ready for release - - -- Joachim Breitner <[email protected]> Thu, 14 Jun 2007 14:24:19 +0100 - -sm (0.1-1) UNRELEASED; urgency=low - - * Initial release. - - -- Joachim Breitner <[email protected]> Thu, 14 Jun 2007 13:33:54 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/debian/compat new/screen-message-0.25/debian/compat --- old/screen-message-0.23/debian/compat 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/debian/control new/screen-message-0.25/debian/control --- old/screen-message-0.23/debian/control 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/debian/control 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -Source: screen-message -Section: games -Priority: optional -Maintainer: Joachim Breitner <[email protected]> -Build-Depends: - debhelper (>= 5.0.51~), - cdbs, - pkg-config, - libpango1.0-dev, - libgtk-3-dev, - imagemagick -Standards-Version: 3.8.4 -Vcs-Darcs: http://darcs.nomeata.de/screen-message.debian -Vcs-Browser: http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=screen-message.debian;a=summary - -Package: sm -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Displays a short text fullscreen - Screen Message will display a given multi-line message as large as - possible, fullscreen and black on white. You can specify the text either - when launching sm, or edit it while the program is running. - . - It is useful to send messages across a room, e.g. during an university - lecture. For fast startup, it is recommended to bind it to a key in your - Desktop Environment. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/debian/copyright new/screen-message-0.25/debian/copyright --- old/screen-message-0.23/debian/copyright 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/debian/copyright 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -This package was debianized by Joachim Breitner <[email protected]> on -Thu, 14 Jun 2007 13:44:35 +0100 - -It was downloaded from http://darcs.nomeata.de/screen-message - -Copyright: © 2007-2009 Joachim Breitner <[email protected]> - -License: - - 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 - of the License, 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. - -The GPL is available in /usr/share/common-licenses/GPL-2 on Debian -systems. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/debian/rules new/screen-message-0.25/debian/rules --- old/screen-message-0.23/debian/rules 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/debian/rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk - -install/sm:: - dh_icons - mkdir -p debian/sm/usr/share/pixmaps - convert sm.png -resize 32x32 debian/sm/usr/share/pixmaps/sm.xpm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/debian/sm.menu new/screen-message-0.25/debian/sm.menu --- old/screen-message-0.23/debian/sm.menu 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/debian/sm.menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -?package(sm):needs="X11" section="Games/Toys"\ - title="sm" command="/usr/games/sm"\ - icon="/usr/share/pixmaps/sm.xpm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/debian/source/format new/screen-message-0.25/debian/source/format --- old/screen-message-0.23/debian/source/format 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/debian/source/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.0 (quilt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/missing new/screen-message-0.25/missing --- old/screen-message-0.23/missing 1970-01-01 01:00:00.000000000 +0100 +++ new/screen-message-0.25/missing 2017-05-09 14:04:29.000000000 +0200 @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2013-10-28.13; # UTC + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. + +# 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, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to <[email protected]>." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/sm.6 new/screen-message-0.25/sm.6 --- old/screen-message-0.23/sm.6 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/sm.6 2017-05-09 14:20:01.000000000 +0200 @@ -37,6 +37,8 @@ .PP To clear the displayed text, press Escape. .PP +To invert the colors of the text and the background, press Ctrl-I. +.PP To quit the program, press Ctrl-Q, or Escape twice, or click the "Quit"-button. .br @@ -56,6 +58,10 @@ Define a different color to use for the background of the text to display than white. For possible values, see above. .TP +.BI \-i,\ \-\-invert +Switch the roles for foreground and background colors. Useful if you prefer +white-on-black. +.TP .BI \-n,\ \-\-font= fontspec Define a different font to use than the default sans-serif font of your system. The fontspec be the complete name for a truetype font (like diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/sm.c new/screen-message-0.25/sm.c --- old/screen-message-0.23/sm.c 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/sm.c 2017-05-09 14:22:22.000000000 +0200 @@ -20,6 +20,7 @@ #include <gtk/gtk.h> #include <gdk/gdk.h> #include <pango/pango.h> +#include <cairo.h> #include <string.h> #include <stdio.h> #include <stdlib.h> @@ -48,6 +49,8 @@ static PangoFontDescription *font; static char *foreground = NULL; static char *background = NULL; +static int inverted = 0; // 0 = normal, 1 = foreground and background swapped +static GdkRGBA white, black; static char *fontdesc = NULL; static int rotation = 0; // 0 = normal, 1 = left, 2 = inverted, 3 = right static int alignment = 0; // 0 = centered, 1 = left-aligned, 2 = right-aligned @@ -84,6 +87,11 @@ } } +static void invert_text(GtkAccelGroup *accel, GObject *window, guint keyval, GdkModifierType modifier) { + inverted = !inverted; + gtk_widget_queue_draw(draw); +} + static char *get_text() { GtkTextIter start, end; gtk_text_buffer_get_start_iter(tb,&start); @@ -94,8 +102,11 @@ static void redraw(GtkWidget *draw, cairo_t *cr, gpointer data) { int q; - const char *text = get_text(); + gdk_cairo_set_source_rgba(cr, inverted ? &black : &white); + cairo_paint(cr); + + const char *text = get_text(); if (strlen(text) > 0) { int w1, h1; static PangoLayout* layout; @@ -119,6 +130,7 @@ pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER); } + pango_layout_get_pixel_size(layout, &w1, &h1); if (w1>0 && h1>0) { int w2 = gtk_widget_get_allocated_width(draw); @@ -135,14 +147,6 @@ double s = min ((double)w2/rw1, (double)h2/rh1); - cairo_save(cr); - - GdkRGBA color; - gtk_style_context_get_color (gtk_widget_get_style_context(draw), - GTK_STATE_NORMAL, &color); - gdk_cairo_set_source_rgba(cr, &color); - - if (alignment == 1) { // left align cairo_translate(cr, (s * rw1)/2, h2/2); } else if (alignment == 2) { // right align @@ -153,9 +157,8 @@ cairo_rotate(cr, rotation * M_PI_2); cairo_scale(cr, s, s); cairo_translate(cr, -w1/2, -h1/2); + gdk_cairo_set_source_rgba(cr, inverted ? &white : &black); pango_cairo_show_layout (cr, layout); - - cairo_restore(cr); } g_object_unref(layout); } @@ -263,6 +266,7 @@ {"version", no_argument, NULL, 'V'}, {"foreground", required_argument, NULL, 'f'}, {"background", required_argument, NULL, 'b'}, + {"invert", required_argument, NULL, 'i'}, {"font", required_argument, NULL, 'n'}, {"rotate", required_argument, NULL, 'r'}, {"align", required_argument, NULL, 'a'}, @@ -270,19 +274,26 @@ }; static void usage(char *cmd) { - printf("Usage: %s [-h|--help] [-V|--version] [-f|--foreground=colordesc] [-b|--background=colordesc] [-n|--font=fontdesc] [-r|--rotate=0,1,2,3] [-a|--align=0,1,2]\n", cmd); + printf("Usage: %s [-h|--help] [-V|--version] [-f|--foreground=colordesc] [-b|--background=colordesc] [-i|--inverted] [-n|--font=fontdesc] [-r|--rotate=0,1,2,3] [-a|--align=0,1,2]\n", cmd); } static void version() { printf("%s\n", PACKAGE_STRING); } +gboolean my_gdk_rgba_parse (GdkRGBA *rgba, const gchar *spec) { + gboolean ret = gdk_rgba_parse(rgba, spec); + if (!ret) { + fprintf (stderr, "Failed to parse color specification %s\n", spec); + } +} + int main(int argc, char **argv) { GString *input; int c; int input_provided = 0; - while ((c = getopt_long (argc, argv, "hVf:b:n:r:a:", long_options, (int *) 0)) != EOF) { + while ((c = getopt_long (argc, argv, "hVf:b:n:r:a:i", long_options, (int *) 0)) != EOF) { switch (c) { case 'h': usage(argv[0]); @@ -311,6 +322,9 @@ case 'a': alignment = atoi(optarg); break; + case 'i': + inverted = !inverted; + break; default: /* unknown switch received - at least * give usage but continue and use the @@ -328,23 +342,20 @@ g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); - GdkRGBA white, black; if (foreground != NULL) { - gdk_rgba_parse(&black, foreground); + my_gdk_rgba_parse(&black, foreground); } else { - gdk_rgba_parse(&black, "black"); + my_gdk_rgba_parse(&black, "black"); } if (background != NULL) { - gdk_rgba_parse(&white, background); + my_gdk_rgba_parse(&white, background); } else { - gdk_rgba_parse(&white, "white"); + my_gdk_rgba_parse(&white, "white"); } draw = gtk_drawing_area_new(); gtk_widget_set_events(draw, GDK_BUTTON_PRESS_MASK|GDK_KEY_PRESS_MASK); gtk_widget_set_size_request(draw,400,400); - gtk_widget_override_background_color(draw, GTK_STATE_NORMAL, &white); - gtk_widget_override_color(draw, GTK_STATE_NORMAL, &black); g_signal_connect(G_OBJECT(draw), "button-press-event", G_CALLBACK(text_clicked), NULL); g_signal_connect(G_OBJECT(draw), "key-press-event", G_CALLBACK(text_keypress), NULL); gtk_widget_set_can_focus(draw, TRUE); @@ -420,6 +431,8 @@ gtk_accel_group_connect(accel, key, mod, 0, g_cclosure_new(G_CALLBACK(gtk_main_quit), NULL, NULL)); gtk_accelerator_parse("Escape", &key, &mod); gtk_accel_group_connect(accel, key, mod, 0, g_cclosure_new(G_CALLBACK(clear_text), NULL, NULL)); + gtk_accelerator_parse("<Ctrl>I", &key, &mod); + gtk_accel_group_connect(accel, key, mod, 0, g_cclosure_new(G_CALLBACK(invert_text), NULL, NULL)); gtk_window_add_accel_group(GTK_WINDOW(window), accel); gtk_widget_show_all(window); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/screen-message-0.23/sm.html new/screen-message-0.25/sm.html --- old/screen-message-0.23/sm.html 2014-12-23 19:41:16.000000000 +0100 +++ new/screen-message-0.25/sm.html 2017-05-09 14:03:33.000000000 +0200 @@ -26,7 +26,6 @@ left:0px; width:100%; height:100%; - white-space:nowrap; font-family: sans; padding:0px; margin:0px; @@ -34,6 +33,11 @@ text-align:center; overflow:hidden; resize:none; + /* + This used to be here. Not sure why, but eventually, + it broke Firefox (newlines not wrapping lines) + white-space:nowrap; + */ } /* disable focus border at Chrome */ @@ -167,7 +171,7 @@ You can <a href="#" onclick="window.navigator.mozApps.install('http://sm.nomeata.de/sm.webapp')">install it as a FireFox app</a>. </p> <p> -For more information about the original program, see what <a href="http://debaday.debian.net/2007/07/18/screen-message-use-your-screen-to-communicate/";>Deb-a-Day</a> writes about it. You can download it from <a href="http://packages.debian.org/sid/sm";>Debian</a> or <a href="http://darcs.nomeata.de/screen-message/";>fetch the sourcecode</a>. +For more information about the original program, see what <a href="http://debaday.debian.net/2007/07/18/screen-message-use-your-screen-to-communicate/";>Deb-a-Day</a> writes about it. You can download it from <a href="http://packages.debian.org/sid/sm";>Debian</a> or <a href="http://github.com/nomeata/screen-message/";>fetch the sourcecode</a>. </p> <p> <strong>screen-message</strong> was created by <a href="http://www.joachim-breitner.de/";>Joachim Breitner</a>.
