Merge branch 'dev-1.4.2' into master

CHANGELOG.md

@@ -1,6 +1,19 @@
 Changelog
 ---------
 
+##### 1.4.2
+
+- Still no support for Adium.  We just don't know how!  Help wanted!  PLEASE!
+- Update Windows dependencies
+- Support ancient glib (See #501)
+- Update translations.  Thanks to the following people:
+    * Eduardo Trápani <etrapani@gmail.com> (es)
+    * Olesya Gerasimenko <gammaray@basealt.ru> (ru)
+- Fix: Handle forwarded messages and captioned images better
+- Fix: Handle replies better
+- Fix: Images in own messages
+- Fix: Remove *some* of the duplicate messages seen (Maybe fixes #258?)
+
 ##### 1.4.1
 
 - *REMOVED* active support for Adium.  We just don't know how!  Help wanted!

HACKING.md

@@ -27,18 +27,31 @@ Make sure that the string freeze has already happened.
 
 Go to the [translation site](https://www.transifex.com/telegram-purple-developers/telegram-purple/content/),
 and close the current resource for new translations.  Rename and re-prioritize it appropriately.
-Download the zip-file, extract it, remove the annoying prefix.  Move all files to `po/`.
+Download the zip-file, extract it, remove the annoying prefix.  Move all files to `po/`, except `en.po`.
+
+While waiting for the download link, create the new resource with the new potfile,
+then re-upload all the old translations there.
 
 Run `make po/*.po` to fix the filenames.  Do not delete any files.  Rationale see `Makefile`.
 
 Adjust `po/LINGUAS*` as you see fit.
 
+Also import the translations for `AppStream/po/`.
+
 #### Increment version
 
 Attempt to use semver.
 
 Adjust `configure.ac`, in macro `AC_INIT`.  Remember to run `autoreconf`.
 
+Adjust `telegram-adium/telegram-adium/telegram-adium-Info.plist`.
+
+Adjust `rpm/purple-telegram.spec`, in version at the top and "changelog" below.
+
+Don't update debian: It's abandoned anyway.
+
+AppStream: Nothing to do.
+
 Update `CHANGELOG.md`.
 
 #### Run some tests
@@ -48,6 +61,8 @@ Also, install it locally.  Don't forget to `./configure` first.
 
 #### Prepare release files
 
+Merge into `master`.
+
 Make a tag: `git tag v1.something`
 Remember to push the tag to github.
 
@@ -59,8 +74,24 @@ Keep the resulting `telegram-purple-1.something+gcafebabe5.exe` safe.
 
 #### Create release on github
 
-FIXME
+See the [release page](https://github.com/majn/telegram-purple/releases/).
+Feel free to be inspired by the previous release-messages.
+
+Remember to upload the origtar *and* Windows installer.
 
 #### Close associated issues
 
 All relevant issues are marked with `in-pipeline`, but sadly too many are marked this way.
+
+#### Organize branches
+
+Create a new branch `dev-1.nextsomething`, delete the old branch.
+
+#### Create new translation goal on transifex
+
+Be pessimistic in the slug-name.
+
+Run `./autogen.sh` to make all string changes available.
+
+Also, create an announcement that yes there is a new resource,
+but this resource may change significantly until the next string freeze.

Makefile.in

@@ -22,7 +22,8 @@ datarootdir=@datarootdir@
 localedir=@localedir@
 gettext_package=@GETTEXT_PACKAGE@
 
-PIDGIN_VERSION=2.12.0
+# Also update mkwindows.sh
+PIDGIN_VERSION=2.13.0
 WIN32_GTK_BUNDLE_DIR=win32/gtk+-bundle_2.24.10-20120208_win32
 WIN32_GTK_BUNDLE_URL=http://ftp.acc.umu.se/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip
 WIN32_GTK_BUNDLE_FILE=win32/gtk+-bundle_2.24.10-20120208_win32.zip
@@ -32,9 +33,9 @@ WIN32_PIDGIN_SRC_DIR=win32/pidgin-${PIDGIN_VERSION}
 WIN32_PIDGIN_BIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/${PIDGIN_VERSION}/pidgin-${PIDGIN_VERSION}-win32-bin.zip/download
 WIN32_PIDGIN_BIN_FILE=win32/pidgin-${PIDGIN_VERSION}-win32-bin.zip
 WIN32_PIDGIN_BIN_DIR=win32/pidgin-${PIDGIN_VERSION}-win32bin
-WIN32_WEBP_URL=https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-0.6.1.tar.gz
-WIN32_WEBP_FILE=win32/libwebp-0.6.1.tar.gz
-WIN32_WEBP_DIR=win32/libwebp-0.6.1
+WIN32_WEBP_URL=https://github.com/webmproject/libwebp/archive/v1.0.2.tar.gz
+WIN32_WEBP_FILE=win32/libwebp-1.0.2.tar.gz
+WIN32_WEBP_DIR=win32/libwebp-1.0.2
 WIN32_DIRS=${WIN32_GTK_BUNDLE_DIR} ${WIN32_PIDGIN_SRC_DIR} ${WIN32_PIDGIN_BIN_DIR} ${WIN32_WEBP_DIR}
 # Not directly used here, but the usage will be injected via the CFLAGS configure var.
 # Note on webp: locally cross-built!  That's why it violates the pattern.
@@ -47,7 +48,7 @@ WIN32_INC=-I${WIN32_PIDGIN_SRC_DIR}/pidgin \
           -I${WIN32_GTK_BUNDLE_DIR}/lib/glib-2.0/include \
           -I${WIN32_GTK_BUNDLE_DIR}/include/gtk-2.0 \
           -I${WIN32_GTK_BUNDLE_DIR}/lib/gtk-2.0/include \
-          -Iobjs/webp-install/include
+          -Iobjs/webp/install/include
 WIN32_CONTRIB_FILES=contrib/libgcrypt-20.dll contrib/libgpg-error-0.dll contrib/libgcc_s_sjlj-1.dll
 
 CFLAGS_INTL=-DENABLE_NLS -DLOCALEDIR='"$(localedir)"'
@@ -339,7 +340,7 @@ dist: check-clean commit.h .git create_dirs
 
 .PHONY: clean-here
 clean-here:
-	rm -rf ${DIR_LIST} $(PRPL_LIBNAME) telegram-purple.nsi po/*.mo autom4te.cache AppStream/po/*.mo
+	rm -rf ${DIR_LIST} $(PRPL_LIBNAME) telegram-purple.nsi po/*.mo autom4te.cache AppStream/po/*.mo commit.h
 
 -include test/Makefile
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for telegram-purple 1.4.1.
+# Generated by GNU Autoconf 2.69 for telegram-purple 1.4.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='telegram-purple'
 PACKAGE_TARNAME='telegram-purple'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='telegram-purple 1.4.1'
+PACKAGE_VERSION='1.4.2'
+PACKAGE_STRING='telegram-purple 1.4.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1261,7 +1261,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures telegram-purple 1.4.1 to adapt to many kinds of systems.
+\`configure' configures telegram-purple 1.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1323,7 +1323,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of telegram-purple 1.4.1:";;
+     short | recursive ) echo "Configuration of telegram-purple 1.4.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1432,7 +1432,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-telegram-purple configure 1.4.1
+telegram-purple configure 1.4.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1851,7 +1851,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by telegram-purple $as_me 1.4.1, which was
+It was created by telegram-purple $as_me 1.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5195,7 +5195,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by telegram-purple $as_me 1.4.1, which was
+This file was extended by telegram-purple $as_me 1.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5257,7 +5257,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-telegram-purple config.status 1.4.1
+telegram-purple config.status 1.4.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -20,7 +20,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([telegram-purple], [1.4.1])
+AC_INIT([telegram-purple], [1.4.2])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
 

mkwindows.sh

@@ -29,6 +29,12 @@ then
     # Otherwise:
     # USE_WEBP=n
 fi
+if [ -z "${USE_PNG}" ]
+then
+    USE_PNG=y
+    # Otherwise:
+    # USE_PNG=n
+fi
 if [ -z "${USE_VERSIONINFO}" ]
 then
     USE_VERSIONINFO=y
@@ -55,18 +61,18 @@ MINGW_BASE=/usr/${MINGW_TARGET}
 MINGW_INCLUDEDIR=/usr/share/mingw-w64/include
 
 # WebP compilation
-WEBP_INSTALL_DIR="objs/webp-install/"
-mkdir -p ${WEBP_INSTALL_DIR}
+WEBP_INSTALL_DIR="objs/webp/install/"
+mkdir -p ${WEBP_INSTALL_DIR}  # Needed for realpath
 WEBP_INSTALL_DIR_FULL="$(realpath ${WEBP_INSTALL_DIR})"
-WEBP_BUILD_DIR="objs/webp-build/"
+WEBP_BUILD_DIR="objs/webp/build/"
 
 # Win32 references
 # Sadly, the library paths must be resolved *now* already.
 # AND, they must be absolute.  Sigh.
 mkdir -p win32
 WIN32_GTK_DEV_DIR=`realpath win32/gtk+-bundle_2.24.10-20120208_win32`
-WIN32_PIDGIN_DIR=`realpath win32/pidgin-2.12.0`
-WIN32_WEBP_PRISTINE="win32/libwebp-0.6.1/"
+WIN32_PIDGIN_DIR=`realpath win32/pidgin-2.13.0`
+WIN32_WEBP_PRISTINE="win32/libwebp-1.0.2/"
 
 # Versioning information
 ./configure -q
@@ -133,15 +139,20 @@ else
     mkdir -p "${WEBP_INSTALL_DIR}"
     # -a to (hopefully) preserve some timestamps
     cp -ar "${WIN32_WEBP_PRISTINE}" "${WEBP_BUILD_DIR}"
-    cd "${WEBP_BUILD_DIR}"
-        # ./configure && make
+    (
+        cd "${WEBP_BUILD_DIR}"
+        # ./autogen.sh && ./configure && make
 
         # Disable linking against PNG, JPEG, TIFF, GIF, WIC,
         # as those would either need cross-compilation, too, or some other magic.
+        ./autogen.sh
+        # libtoolize (called by autoreconf, called by autogen.sh) must not see
+        # `install-sh` because it would become confused by it.
+        # That's why the hierarchy is so deep.
         ./configure -q --build ${HOST} --host ${MINGW_TARGET} --target ${MINGW_TARGET} \
             --disable-dependency-tracking --prefix="${WEBP_INSTALL_DIR_FULL}/" \
             --disable-static --enable-shared \
-            --enable-swap-16bit-csp --enable-experimental \
+            --enable-swap-16bit-csp \
             --disable-libwebpmux --disable-libwebpdemux \
             --disable-libwebpdecoder --disable-libwebpextras \
             --disable-png --disable-jpeg --disable-tiff --disable-gif --disable-wic
@@ -150,12 +161,9 @@ else
         # stems from the fact that 'mt' (magnetic tape control) is not available
         # for i686-w64-mingw32, so the x86_64 version is used.  We can ignore that.
         #
-        # Try to avoid too extreme autotools overhead:
-        touch Makefile.in
-        #
         # Finally.
         make --quiet -j4 install
-    cd ../..
+    )
     if ! [ -r ${WEBP_INSTALL_DIR}/include/webp/decode.h -a -r ${WEBP_INSTALL_DIR}/bin/libwebp-7.dll ] ; then
         # I expect that cross-compiling webp is going to be very fragile,
         # so print a nice error in case this happens.
@@ -194,20 +202,28 @@ then
     LDFLAGS_WEBP="-L${WEBP_INSTALL_DIR_FULL}/bin"
     CONFFLAGS_WEBP="--enable-libwebp"
 fi
-./configure -q --build ${HOST} --host ${MINGW_TARGET} --target ${MINGW_TARGET} \
+if [ "y" = "${USE_PNG}" ]
+then
+    # Library should already be present in win32/gtk+-bundle_2.24.10-20120208_win32/lib
+    CONFFLAGS_PNG="--enable-libpng"
+fi
+# pkg-config is used to find the right directories for icons, library, etc on linux.
+# For Windows, this is already hardcoded in telegram-purple.nsi, so pkg-config isn't needed.
+PKG_CONFIG=/bin/false ./configure -q --build ${HOST} --host ${MINGW_TARGET} --target ${MINGW_TARGET} \
     --disable-libpng --disable-libwebp \
     --with-zlib="${MINGW_BASE}" \
     PURPLE_CFLAGS="\${WIN32_INC}" \
     PURPLE_LIBS="-lpurple -lglib-2.0" \
     LDFLAGS="-L${WIN32_GTK_DEV_DIR}/lib -L${WIN32_PIDGIN_DIR}-win32bin ${LDFLAGS_WEBP}" \
     LIBS="-lssp -lintl -lws2_32" \
     ${CONFFLAGS_WEBP}
-cd tgl
-./configure -q --build ${HOST} --host ${MINGW_TARGET} --target ${MINGW_TARGET} \
-    --disable-openssl --disable-extf \
-    --with-zlib="${MINGW_BASE}" \
-    LIBS="-lssp"
-cd ..
+(
+    cd tgl
+    ./configure -q --build ${HOST} --host ${MINGW_TARGET} --target ${MINGW_TARGET} \
+        --disable-openssl --disable-extf \
+        --with-zlib="${MINGW_BASE}" \
+        LIBS="-lssp"
+)
 
 # Pretend we're building up the preliminaries for auto/
 echo "===== 06: Compile tgl, pre-'generate' files"
@@ -234,7 +250,7 @@ echo "===== 09: Compile telegram-purple"
 VERSIONINFO_OBJECTS=""
 if [ "y" = "${USE_VERSIONINFO}" ]
 then
-    mkdir -p objs
+    make objs commit.h
     cat <<EOFRC > objs/info.rc
 #include "../commit.h"
 1 VERSIONINFO
@@ -267,15 +283,13 @@ make -j4 bin/libtelegram.dll \
 
 # Package it up
 echo "===== 10: Create installer"
-VERSION=`grep -E 'PACKAGE_VERSION' config.h | sed -re 's/^.*"(.*)".*$/\1/'`
-COMMIT=`grep -E 'define' commit.h | sed -re 's/^.*"(.*)".*$/\1/'`
 make PRPL_NAME=libtelegram.dll win-installer-deps
 makensis -DPLUGIN_VERSION="${VERSION}+g${COMMIT}" -DPRPL_NAME=libtelegram.dll \
     -DWIN32_DEV_TOP=contrib telegram-purple.nsi
 
 # There's no monster under your bed, I swear.
 echo "===== 11: Unspoof files"
 # Stealth cleanup
-cd tgl && git checkout tl-parser/tl-parser.c tl-parser/tlc.c && cd ..
+( cd tgl && git checkout tl-parser/tl-parser.c tl-parser/tlc.c )
 
 echo "===== COMPLETE: All done.  Installer executable is in top directory."

po/bg.po

@@ -4,15 +4,14 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Ben Wiederhake <BenWiederhake.GitHub@gmx.de>, 2017
-# Любомир Василев, 2018
+# Ben Wiederhake <BenWiederhake.GitHub@gmx.de>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: telegram-purple\n"
 "POT-Creation-Date: 2018-08-01 23:11+0200\n"
-"PO-Revision-Date: 2017-04-11 23:02+0000\n"
-"Last-Translator: Любомир Василев, 2018\n"
+"PO-Revision-Date: 2019-03-02 01:07+0000\n"
+"Last-Translator: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>, 2019\n"
 "Language-Team: Bulgarian (https://www.transifex.com/telegram-purple-developers/teams/53149/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

po/cs_CZ.po

@@ -4,15 +4,14 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Jan Breuer <j123b567@jaybee.cz>, 2018
-# Ben Wiederhake <BenWiederhake.GitHub@gmx.de>, 2018
+# Ben Wiederhake <BenWiederhake.GitHub@gmx.de>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: telegram-purple\n"
 "POT-Creation-Date: 2018-08-01 23:11+0200\n"
-"PO-Revision-Date: 2017-04-11 23:02+0000\n"
-"Last-Translator: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>, 2018\n"
+"PO-Revision-Date: 2019-03-02 01:07+0000\n"
+"Last-Translator: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>, 2019\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/telegram-purple-developers/teams/53149/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"