Hello community, here is the log from the commit of package gource for openSUSE:Factory checked in at 2018-06-19 11:57:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gource (Old) and /work/SRC/openSUSE:Factory/.gource.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gource" Tue Jun 19 11:57:40 2018 rev:11 rq:616445 version:0.48 Changes: -------- --- /work/SRC/openSUSE:Factory/gource/gource.changes 2017-11-19 11:17:10.642748636 +0100 +++ /work/SRC/openSUSE:Factory/.gource.new/gource.changes 2018-06-19 11:57:46.731141615 +0200 @@ -1,0 +2,7 @@ +Tue Jun 12 20:07:31 UTC 2018 - [email protected] + +- Update to version 0.48: + * Can now generate logs from git sub module directories. + * Fixed building with GLM 0.9.9. + +------------------------------------------------------------------- Old: ---- gource-0.47.tar.gz New: ---- gource-0.48.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gource.spec ++++++ --- /var/tmp/diff_new_pack.qdw8Zm/_old 2018-06-19 11:57:47.967095723 +0200 +++ /var/tmp/diff_new_pack.qdw8Zm/_new 2018-06-19 11:57:47.967095723 +0200 @@ -1,7 +1,7 @@ # # spec file for package gource # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,10 +17,10 @@ Name: gource -Version: 0.47 +Version: 0.48 Release: 0 Summary: Software version control visualization tool -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Graphics/Visualization/Graph Url: http://gource.io/ Source: https://github.com/acaudwell/Gource/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -66,7 +66,8 @@ %make_install %files -%doc COPYING ChangeLog README THANKS +%doc ChangeLog README THANKS +%license COPYING %{_mandir}/man1/* %{_bindir}/gource %{_datadir}/gource/ ++++++ gource-0.47.tar.gz -> gource-0.48.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/ChangeLog new/gource-0.48/ChangeLog --- old/gource-0.47/ChangeLog 2017-09-08 04:29:07.000000000 +0200 +++ new/gource-0.48/ChangeLog 2018-02-13 04:01:35.000000000 +0100 @@ -1,3 +1,7 @@ +0.48: + * Can now generate logs from git sub module directories. + * Fixed building with GLM 0.9.9. + 0.47: * Fixed low mouse movement speed with some mice while repositioning camera. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/README new/gource-0.48/README --- old/gource-0.47/README 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/README 2018-02-13 04:01:35.000000000 +0100 @@ -188,13 +188,13 @@ Show filename extensions only. --file-filter REGEX - Filter out any files matching a specified regular expression. + Filter out file paths matching the specified regular expression. --file-show-filter REGEX - Show only files matching this regular expression. + Show only file paths matching the specified regular expression. --user-filter REGEX - Filter out any users matching a specified regular expression. + Filter usernames matching the specified regular expression. --user-image-dir DIRECTORY Directory containing .jpg or .png images of users diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/build-aux/config.guess new/gource-0.48/build-aux/config.guess --- old/gource-0.47/build-aux/config.guess 2017-09-08 04:29:07.000000000 +0200 +++ new/gource-0.48/build-aux/config.guess 2018-02-13 04:01:35.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-10-02' +timestamp='2017-11-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # 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/>. +# along with this program; if not, see <https://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 @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to <[email protected]>. @@ -39,7 +39,7 @@ Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -244,6 +244,9 @@ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} exit ;; + *:MidnightBSD:*:*) + echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -259,6 +262,9 @@ *:Sortix:*:*) echo ${UNAME_MACHINE}-unknown-sortix exit ;; + *:Redox:*:*) + echo ${UNAME_MACHINE}-unknown-redox + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -315,15 +321,6 @@ exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; @@ -485,13 +482,13 @@ #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); @@ -614,7 +611,7 @@ *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and @@ -635,8 +632,8 @@ 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` @@ -749,7 +746,7 @@ { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -758,7 +755,7 @@ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -837,10 +834,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -854,10 +852,6 @@ *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; @@ -873,27 +867,12 @@ echo ia64-unknown-interix${UNAME_RELEASE} exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -1096,7 +1075,7 @@ i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + i*86:*:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} @@ -1303,14 +1282,21 @@ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1334,15 +1320,18 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1414,16 +1403,28 @@ exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <<EOF + +NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize +the system type. Please install a C compiler and try again. +EOF + ;; +esac + cat >&2 <<EOF -$0: unable to guess system type This script (version $timestamp), has failed to recognize the -operating system you are using. If your script is old, overwrite -config.guess and config.sub with the latest versions from: +operating system you are using. If your script is old, overwrite *all* +copies of config.guess and config.sub with the latest versions from: - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess + https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub If $0 has already been updated, send the following data and any information you think might be pertinent to [email protected] to @@ -1455,7 +1456,7 @@ exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/build-aux/config.sub new/gource-0.48/build-aux/config.sub --- old/gource-0.47/build-aux/config.sub 2017-09-08 04:29:07.000000000 +0200 +++ new/gource-0.48/build-aux/config.sub 2018-02-13 04:01:35.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-11-04' +timestamp='2017-11-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # 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/>. +# along with this program; if not, see <https://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 @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -57,7 +57,7 @@ Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -229,9 +229,6 @@ -ptx*) basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; -psos*) os=-psos ;; @@ -263,7 +260,7 @@ | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -315,7 +312,7 @@ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ - | we32k \ + | wasm32 \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown @@ -388,7 +385,7 @@ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -446,6 +443,7 @@ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -641,7 +639,7 @@ basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; @@ -903,7 +901,7 @@ basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -948,6 +946,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1243,6 +1244,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1251,6 +1255,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1358,8 +1365,8 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1379,9 +1386,9 @@ -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1397,7 +1404,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ @@ -1409,7 +1416,7 @@ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1484,7 +1491,7 @@ -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1539,6 +1546,19 @@ -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; -ios) @@ -1638,6 +1658,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; @@ -1683,7 +1706,7 @@ m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1818,7 +1841,7 @@ exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/configure new/gource-0.48/configure --- old/gource-0.47/configure 2017-09-08 04:29:09.000000000 +0200 +++ new/gource-0.48/configure 2018-02-13 04:01:35.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Gource 0.47. +# Generated by GNU Autoconf 2.69 for Gource 0.48. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Gource' PACKAGE_TARNAME='gource' -PACKAGE_VERSION='0.47' -PACKAGE_STRING='Gource 0.47' +PACKAGE_VERSION='0.48' +PACKAGE_STRING='Gource 0.48' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1345,7 +1345,7 @@ # 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 Gource 0.47 to adapt to many kinds of systems. +\`configure' configures Gource 0.48 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1420,7 +1420,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Gource 0.47:";; + short | recursive ) echo "Configuration of Gource 0.48:";; esac cat <<\_ACEOF @@ -1551,7 +1551,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Gource configure 0.47 +Gource configure 0.48 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2163,7 +2163,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Gource $as_me 0.47, which was +It was created by Gource $as_me 0.48, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3027,7 +3027,7 @@ # Define the identity of the package. PACKAGE='gource' - VERSION='0.47' + VERSION='0.48' cat >>confdefs.h <<_ACEOF @@ -8335,7 +8335,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Gource $as_me 0.47, which was +This file was extended by Gource $as_me 0.48, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8392,7 +8392,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Gource config.status 0.47 +Gource config.status 0.48 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/configure.ac new/gource-0.48/configure.ac --- old/gource-0.47/configure.ac 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/configure.ac 2018-02-13 04:01:35.000000000 +0100 @@ -3,7 +3,7 @@ AC_PREREQ(2.61) -AC_INIT(Gource, 0.47, [[email protected]]) +AC_INIT(Gource, 0.48, [[email protected]]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([src/main.h]) AM_INIT_AUTOMAKE([dist-bzip2 foreign subdir-objects]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/data/gource.1 new/gource-0.48/data/gource.1 --- old/gource-0.47/data/gource.1 2017-09-08 04:29:01.000000000 +0200 +++ new/gource-0.48/data/gource.1 2018-02-13 04:01:35.000000000 +0100 @@ -155,13 +155,13 @@ Show filename extensions only. .TP \fB\-\-file\-filter REGEX\fR -Filter out any files matching a specified regular expression. +Filter out file paths matching the specified regular expression. .TP \fB\-\-file\-show\-filter REGEX\fR -Show only files matching this regular expression. +Show only file paths matching the specified regular expression. .TP \fB\-\-user\-filter REGEX\fR -Filter out any usernames matching a specified regular expression. +Filter usernames matching the specified regular expression. .TP \fB\-\-user\-image\-dir DIRECTORY\fR Directory containing .jpg or .png images of users (eg 'Full Name.png') to use as avatars. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/src/core/fxfont.cpp new/gource-0.48/src/core/fxfont.cpp --- old/gource-0.47/src/core/fxfont.cpp 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/src/core/fxfont.cpp 2018-02-13 04:01:35.000000000 +0100 @@ -63,19 +63,19 @@ this->chr = chr; this->ftglyph = 0; - FT_Face ftface = set->getFTFace(); + FT_Face ft_face = set->getFTFace(); - FT_UInt index = FT_Get_Char_Index( ftface, chr ); + FT_UInt index = FT_Get_Char_Index( ft_face, chr ); //debugLog("FXGlyph %x %d %d", chr, chr, index); - if(FT_Load_Glyph( ftface, index, FT_LOAD_DEFAULT )) - throw FXFontException(ftface->family_name); + if(FT_Load_Glyph( ft_face, index, set->getFlags())) + throw FXFontException(ft_face->family_name); - if(FT_Get_Glyph( ftface->glyph, &ftglyph )) - throw FXFontException(ftface->family_name); + if(FT_Get_Glyph( ft_face->glyph, &ftglyph )) + throw FXFontException(ft_face->family_name); - FT_Glyph_Metrics *metrics = &ftface->glyph->metrics; + FT_Glyph_Metrics *metrics = &ft_face->glyph->metrics; height = glm::ceil(metrics->height / 64.0); FT_Glyph_To_Bitmap( &ftglyph, FT_RENDER_MODE_NORMAL, 0, 1 ); @@ -84,7 +84,7 @@ dims = vec2( glyph_bitmap->bitmap.width, glyph_bitmap->bitmap.rows) + vec2(2.0f, 2.0f); corner = vec2( glyph_bitmap->left, -glyph_bitmap->top) + vec2(0.5, -0.5); - advance = vec2( ftface->glyph->advance.x >> 6, ftface->glyph->advance.y >> 6); + advance = vec2( ft_face->glyph->advance.x >> 6, ft_face->glyph->advance.y >> 6); vertex_positions[0] = vec2(0.0f, 0.0f); vertex_positions[1] = vec2(dims.x, 0.0f); @@ -204,12 +204,13 @@ //FXGlyphSet -FXGlyphSet::FXGlyphSet(FT_Library freetype, const std::string& fontfile, int size, int dpi) { +FXGlyphSet::FXGlyphSet(FT_Library freetype, const std::string& fontfile, int size, int dpi, FT_Int32 ft_flags) { this->freetype = freetype; this->fontfile = fontfile; this->size = size; this->dpi = dpi; - this->ftface = 0; + this->ft_flags = ft_flags; + this->ft_face = 0; this->tab_width = 4.0f; this->max_height = 0; @@ -218,7 +219,7 @@ } FXGlyphSet::~FXGlyphSet() { - if(ftface!=0) FT_Done_Face(ftface); + if(ft_face!=0) FT_Done_Face(ft_face); for(std::vector<FXGlyphPage*>::iterator it = pages.begin(); it != pages.end(); it++) { delete (*it); @@ -233,17 +234,17 @@ void FXGlyphSet::init() { - if(FT_New_Face(freetype, fontfile.c_str(), 0, &ftface)) { + if(FT_New_Face(freetype, fontfile.c_str(), 0, &ft_face)) { throw FXFontException(fontfile); } int ft_font_size = 64 * size; - FT_Set_Char_Size( ftface, ft_font_size, ft_font_size, dpi, dpi ); + FT_Set_Char_Size( ft_face, ft_font_size, ft_font_size, dpi, dpi ); - double em_size = 1.0 * ftface->units_per_EM; + double em_size = 1.0 * ft_face->units_per_EM; - unit_scale = vec2( ftface->size->metrics.x_ppem / em_size, ftface->size->metrics.y_ppem / em_size); + unit_scale = vec2( ft_face->size->metrics.x_ppem / em_size, ft_face->size->metrics.y_ppem / em_size); precache("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ;:'\",<.>/?-_=+!@#$%^&*()\\ "); } @@ -313,7 +314,7 @@ } float FXGlyphSet::getMaxWidth() const { - return ftface->size->metrics.max_advance / 64.0f; + return ft_face->size->metrics.max_advance / 64.0f; } float FXGlyphSet::getMaxHeight() const { @@ -632,7 +633,7 @@ fonts.clear(); } -FXFont FXFontManager::grab(std::string font_file, int size, int dpi) { +FXFont FXFontManager::grab(std::string font_file, int size, int dpi, FT_Int32 ft_flags) { if(font_dir.size()>0 && font_file[0] != '/') { font_file = font_dir + font_file; @@ -652,7 +653,7 @@ FXGlyphSet* glyphset; if(ft_it == sizemap->end()) { - glyphset = new FXGlyphSet(library, font_file.c_str(), size, dpi); + glyphset = new FXGlyphSet(library, font_file.c_str(), size, dpi, ft_flags); sizemap->insert(std::pair<int,FXGlyphSet*>(size,glyphset)); } else { glyphset = ft_it->second; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/src/core/fxfont.h new/gource-0.48/src/core/fxfont.h --- old/gource-0.47/src/core/fxfont.h 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/src/core/fxfont.h 2018-02-13 04:01:35.000000000 +0100 @@ -127,14 +127,14 @@ class FXGlyphSet { FT_Library freetype; - FT_Face ftface; + FT_Face ft_face; + FT_Int32 ft_flags; std::string fontfile; int max_height; int size; int dpi; float tab_width; vec2 unit_scale; - bool pre_caching; std::vector<FXGlyphPage*> pages; @@ -144,12 +144,13 @@ void init(); FXGlyph* getGlyph(unsigned int chr); public: - FXGlyphSet(FT_Library freetype, const std::string& fontfile, int size, int dpi); + FXGlyphSet(FT_Library freetype, const std::string& fontfile, int size, int dpi, FT_Int32 ft_flags); ~FXGlyphSet(); void precache(const std::string& chars); - FT_Face getFTFace() const { return ftface; } + FT_Face getFTFace() const { return ft_face; } + FT_Int32 getFlags() const { return ft_flags; } const std::string& getFontFile() const { return fontfile; } @@ -251,7 +252,7 @@ void commitBuffer(); void drawBuffer(); - FXFont grab(std::string font_file, int size, int dpi = 72); + FXFont grab(std::string font_file, int size, int dpi = 72, FT_Int32 ft_flags = FT_LOAD_DEFAULT); }; extern FXFontManager fontmanager; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/src/core/vectors.h new/gource-0.48/src/core/vectors.h --- old/gource-0.47/src/core/vectors.h 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/src/core/vectors.h 2018-02-13 04:01:35.000000000 +0100 @@ -34,6 +34,8 @@ #include <glm/gtc/type_ptr.hpp> #include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_access.hpp> + +#define GLM_ENABLE_EXPERIMENTAL #include <glm/gtx/norm.hpp> using glm::vec2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/src/formats/git.cpp new/gource-0.48/src/formats/git.cpp --- old/gource-0.47/src/formats/git.cpp 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/src/formats/git.cpp 2018-02-13 04:01:35.000000000 +0100 @@ -77,7 +77,7 @@ std::string gitdir = dir + std::string("/.git"); struct stat dirinfo; int stat_rc = stat(gitdir.c_str(), &dirinfo); - if(stat_rc!=0 || !(dirinfo.st_mode & S_IFDIR)) { + if(stat_rc!=0 || !(dirinfo.st_mode & S_IFDIR || dirinfo.st_mode & S_IFREG)) { return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/src/gource_settings.cpp new/gource-0.48/src/gource_settings.cpp --- old/gource-0.47/src/gource_settings.cpp 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/src/gource_settings.cpp 2018-02-13 04:01:35.000000000 +0100 @@ -130,8 +130,8 @@ printf(" --transparent Make the background transparent\n\n"); printf(" --user-filter REGEX Ignore usernames matching this regex\n"); - printf(" --file-filter REGEX Ignore files matching this regex\n"); - printf(" --file-show-filter REGEX Show only files matching this regex\n\n"); + printf(" --file-filter REGEX Ignore file paths matching this regex\n"); + printf(" --file-show-filter REGEX Show only file paths matching this regex\n\n"); printf(" --user-friction SECONDS Change the rate users slow down (default: 0.67)\n"); printf(" --user-scale SCALE Change scale of users (default: 1.0)\n"); @@ -780,6 +780,10 @@ if(!entry->hasValue()) conffile.entryException(entry, "specify caption file (filename)"); caption_file = entry->getString(); + + if(!boost::filesystem::exists(caption_file)) { + conffile.entryException(entry, "caption file not found"); + } } if((entry = gource_settings->getEntry("caption-duration")) != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/src/gource_settings.h new/gource-0.48/src/gource_settings.h --- old/gource-0.47/src/gource_settings.h 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/src/gource_settings.h 2018-02-13 04:01:35.000000000 +0100 @@ -18,7 +18,7 @@ #ifndef GOURCE_SETTINGS_H #define GOURCE_SETTINGS_H -#define GOURCE_VERSION "0.47" +#define GOURCE_VERSION "0.48" #include "core/texture.h" #include "core/settings.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gource-0.47/src/logmill.cpp new/gource-0.48/src/logmill.cpp --- old/gource-0.47/src/logmill.cpp 2017-09-08 04:29:00.000000000 +0200 +++ new/gource-0.48/src/logmill.cpp 2018-02-13 04:01:35.000000000 +0100 @@ -168,7 +168,7 @@ while(is_directory(dir)) { - if(is_directory(dir / ".git")) log_format = "git"; + if(is_directory(dir / ".git") || is_regular_file(dir / ".git")) log_format = "git"; else if(is_directory(dir / ".hg")) log_format = "hg"; else if(is_directory(dir / ".bzr")) log_format = "bzr"; else if(is_directory(dir / ".svn")) log_format = "svn";
