[SCM] gsequencer/master: Imported Upstream version 0.4.2-61
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Tue Jun 16 10:47:54 UTC 2015
The following commit has been merged in the master branch:
commit 62b256f558610652de0f7ad9ae748b66e7a82817
Author: Joël Krähemann <jkraehemann at gmail.com>
Date: Tue Jun 16 12:00:33 2015 +0200
Imported Upstream version 0.4.2-61
diff --git a/Makefile.am b/Makefile.am
index 7664d5a..7975bac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,19 @@
AUTOMAKE_OPTIONS = foreign
# SUBDIRS = src doc
-AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\" -D_FORTIFY_SOURCE=2
+AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\"
# what flags you want to pass to the C compiler & linker
-CFLAGS = -g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security
-LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
+CFLAGS =
+LDFLAGS =
# this lists the binaries to produce, the (non-PHONY, binary) targets in
# the previous manual Makefile
noinst_LIBRARIES =
bin_PROGRAMS = ags
-EXTRA_DIST = gsequencer.share acsite.m4
+EXTRA_DIST = gsequencer.share
CLEANFILES =
-if HAVE_HELP2MAN
-dist_man_MANS=ags.1
-CLEANFILES=$(MANPAGES)
-endif
-
# library
libags_a_CFLAGS= $(GOBJECT_CFLAGS) $(LIBXML2_CFLAGS)
@@ -40,15 +35,10 @@ ags_SOURCES = ./src/ags-lib/object/ags_connectable.c ./src/ags-lib/object/ags_co
ags.desktop: ags.desktop.in
$(AM_V_GEN)sed -e 's,\@datadir\@,$(datadir),g' < "$<" > $@
-if HAVE_HELP2MAN
-ags.1:
- $(HELP2MAN) -o $@ ags
-endif
-
install-data-local:
mkdir -p $(DESTDIR)/$(datadir)/gsequencer/icons
mkdir -p $(DESTDIR)/$(datadir)/gsequencer/images
- cp $(top_srcdir)/gsequencer.share/icons/ags.xpm $(DESTDIR)/$(datadir)/gsequencer/icons/ags.xpm
+ cp $(top_srcdir)/gsequencer.share/icons/jumper.png $(DESTDIR)/$(datadir)/gsequencer/icons/jumper.png
cp $(top_srcdir)/gsequencer.share/images/ags.png $(DESTDIR)/$(datadir)/gsequencer/images/ags.png
uninstall-hook:
diff --git a/Makefile.in b/Makefile.in
index 09775dc..c87d96f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,9 +82,9 @@ bin_PROGRAMS = ags$(EXEEXT)
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in depcomp $(dist_man_MANS) AUTHORS COPYING \
- ChangeLog INSTALL NEWS README compile config.guess \
- config.rpath config.sub install-sh missing
+ $(srcdir)/config.h.in depcomp AUTHORS COPYING ChangeLog \
+ INSTALL NEWS README compile config.guess config.rpath \
+ config.sub install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -96,8 +96,7 @@ CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
- "$(DESTDIR)$(appdatadir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdatadir)"
PROGRAMS = $(bin_PROGRAMS)
am_ags_OBJECTS = ags-ags_connectable.$(OBJEXT) \
ags-ags_combo_box_text.$(OBJEXT) ags-ags_list.$(OBJEXT) \
@@ -410,9 +409,6 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(dist_man_MANS)
DATA = $(appdata_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
@@ -467,7 +463,7 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
# what flags you want to pass to the C compiler & linker
-CFLAGS = -g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security
+CFLAGS =
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -485,13 +481,12 @@ GOBJECT_LIBS = @GOBJECT_LIBS@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
-HELP2MAN = @HELP2MAN@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
+LDFLAGS =
LIBAO_CFLAGS = @LIBAO_CFLAGS@
LIBAO_LIBS = @LIBAO_LIBS@
LIBASOUND2_CFLAGS = @LIBASOUND2_CFLAGS@
@@ -504,7 +499,6 @@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
LIBXML2_LIBS = @LIBXML2_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MANPAGES = @MANPAGES@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -571,15 +565,13 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
# SUBDIRS = src doc
-AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\" -D_FORTIFY_SOURCE=2
+AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\"
# this lists the binaries to produce, the (non-PHONY, binary) targets in
# the previous manual Makefile
noinst_LIBRARIES =
-EXTRA_DIST = gsequencer.share acsite.m4 ags.desktop.in
- at HAVE_HELP2MAN_TRUE@CLEANFILES = $(MANPAGES)
+EXTRA_DIST = gsequencer.share ags.desktop.in
CLEANFILES = $(appdata_DATA)
- at HAVE_HELP2MAN_TRUE@dist_man_MANS = ags.1
# library
libags_a_CFLAGS = $(GOBJECT_CFLAGS) $(LIBXML2_CFLAGS)
@@ -6085,49 +6077,6 @@ ags-ags_ladspa_manager.obj: src/ags/plugin/ags_ladspa_manager.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/ags/plugin/ags_ladspa_manager.c' object='ags-ags_ladspa_manager.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ags_CFLAGS) $(CFLAGS) -c -o ags-ags_ladspa_manager.obj `if test -f 'src/ags/plugin/ags_ladspa_manager.c'; then $(CYGPATH_W) 'src/ags/plugin/ags_ladspa_manager.c'; else $(CYGPATH_W) '$(srcdir)/src/ags/plugin/ags_ladspa_manager.c'; fi`
-install-man1: $(dist_man_MANS)
- @$(NORMAL_INSTALL)
- @list1=''; \
- list2='$(dist_man_MANS)'; \
- test -n "$(man1dir)" \
- && test -n "`echo $$list1$$list2`" \
- || exit 0; \
- echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
- { for i in $$list1; do echo "$$i"; done; \
- if test -n "$$list2"; then \
- for i in $$list2; do echo "$$i"; done \
- | sed -n '/\.1[a-z]*$$/p'; \
- fi; \
- } | while read p; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; echo "$$p"; \
- done | \
- sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
- sed 'N;N;s,\n, ,g' | { \
- list=; while read file base inst; do \
- if test "$$base" = "$$inst"; then list="$$list $$file"; else \
- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
- fi; \
- done; \
- for i in $$list; do echo "$$i"; done | $(am__base_list) | \
- while read files; do \
- test -z "$$files" || { \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
- done; }
-
-uninstall-man1:
- @$(NORMAL_UNINSTALL)
- @list=''; test -n "$(man1dir)" || exit 0; \
- files=`{ for i in $$list; do echo "$$i"; done; \
- l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
- sed -n '/\.1[a-z]*$$/p'; \
- } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-appdataDATA: $(appdata_DATA)
@$(NORMAL_INSTALL)
@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
@@ -6374,9 +6323,9 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(DATA) config.h
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdatadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -6434,7 +6383,7 @@ info: info-am
info-am:
-install-data-am: install-appdataDATA install-data-local install-man
+install-data-am: install-appdataDATA install-data-local
install-dvi: install-dvi-am
@@ -6450,7 +6399,7 @@ install-info: install-info-am
install-info-am:
-install-man: install-man1
+install-man:
install-pdf: install-pdf-am
@@ -6481,12 +6430,9 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-appdataDATA uninstall-binPROGRAMS \
- uninstall-man
+uninstall-am: uninstall-appdataDATA uninstall-binPROGRAMS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-man: uninstall-man1
-
.MAKE: all install-am install-strip uninstall-am
.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
@@ -6500,25 +6446,22 @@ uninstall-man: uninstall-man1
install-binPROGRAMS install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-man1 install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-appdataDATA uninstall-binPROGRAMS \
- uninstall-hook uninstall-man uninstall-man1
+ uninstall-hook
ags.desktop: ags.desktop.in
$(AM_V_GEN)sed -e 's,\@datadir\@,$(datadir),g' < "$<" > $@
- at HAVE_HELP2MAN_TRUE@ags.1:
- at HAVE_HELP2MAN_TRUE@ $(HELP2MAN) -o $@ ags
-
install-data-local:
mkdir -p $(DESTDIR)/$(datadir)/gsequencer/icons
mkdir -p $(DESTDIR)/$(datadir)/gsequencer/images
- cp $(top_srcdir)/gsequencer.share/icons/ags.xpm $(DESTDIR)/$(datadir)/gsequencer/icons/ags.xpm
+ cp $(top_srcdir)/gsequencer.share/icons/jumper.png $(DESTDIR)/$(datadir)/gsequencer/icons/jumper.png
cp $(top_srcdir)/gsequencer.share/images/ags.png $(DESTDIR)/$(datadir)/gsequencer/images/ags.png
uninstall-hook:
diff --git a/acsite.m4 b/acsite.m4
deleted file mode 100644
index c5b4da0..0000000
--- a/acsite.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# check for the presence of help2man
-# if it is available then set MANPAGES to
-# the list of man page files to create
-#
-# AC_PROG_HELP2MAN(list-of-man-pages)
-
-AC_DEFUN([AC_PROG_HELP2MAN],
-[{
-AC_CHECK_PROGS([HELP2MAN], [help2man])
-if ! test -z "$HELP2MAN"
-then
-AC_SUBST(MANPAGES, $1)
-HAVE_HELP2MAN=true
-fi
-AM_CONDITIONAL([HAVE_HELP2MAN], [test x$HAVE_HELP2MAN = xtrue])
-}])
diff --git a/ags.1 b/ags.1
deleted file mode 100644
index 1c8dd46..0000000
--- a/ags.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
-.TH ADVANCED "1" "June 2015" "Advanced Gtk+ Sequencer 0.4.2" "User Commands"
-.SH NAME
-Advanced \- manual page for Advanced Gtk+ Sequencer 0.4.2
-.SH DESCRIPTION
-Advanced Gtk+ Sequencer `ags` is an audio sequencer and notation editor
-.SS "Usage:"
-.TP
-\fB\-\-filename\fR file
-open file
-.TP
-\fB\-\-single\-thread\fR
-run in single thread mode
-.TP
-\fB\-\-help\fR
-display this help and exit
-.TP
-\fB\-\-version\fR
-output version information and exit
-.SH AUTHOR
-Written by Jo??l Kr??hemann
-.SH "REPORTING BUGS"
-Report bugs to <jkraehemann at gmail.com>
-.SH COPYRIGHT
-Copyright \(co 2005\-2015 Jo??l Kr??hemann
-.br
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-The full documentation for
-.B Advanced
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B Advanced
-programs are properly installed at your site, the command
-.IP
-.B info Advanced
-.PP
-should give you access to the complete manual.
diff --git a/ags.desktop.in b/ags.desktop.in
index 28548e5..36b1ea6 100644
--- a/ags.desktop.in
+++ b/ags.desktop.in
@@ -4,6 +4,6 @@ Version=1.0
Type=Application
Terminal=false
Exec=ags
-Icon=@datadir@/gsequencer/icons/ags.xpm
+Icon=@datadir@/gsequencer/icons/jumper.png
Name=Advanced Gtk+ Sequencer
-Categories=AudioVideo;Audio;
+Categories=AudioVideo;Editor;
diff --git a/configure b/configure
index 4b1c3bf..5fdabba 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ags 0.4.2-63.
+# Generated by GNU Autoconf 2.69 for ags 0.4.2-61.
#
# Report bugs to <weedlight at gmail.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ags'
PACKAGE_TARNAME='ags'
-PACKAGE_VERSION='0.4.2-63'
-PACKAGE_STRING='ags 0.4.2-63'
+PACKAGE_VERSION='0.4.2-61'
+PACKAGE_STRING='ags 0.4.2-61'
PACKAGE_BUGREPORT='weedlight at gmail.com'
PACKAGE_URL=''
@@ -654,10 +654,6 @@ ALLOCA
EGREP
GREP
XMKMF
-HAVE_HELP2MAN_FALSE
-HAVE_HELP2MAN_TRUE
-MANPAGES
-HELP2MAN
CPP
am__fastdepCC_FALSE
am__fastdepCC_TRUE
@@ -1321,7 +1317,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 ags 0.4.2-63 to adapt to many kinds of systems.
+\`configure' configures ags 0.4.2-61 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1391,7 +1387,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ags 0.4.2-63:";;
+ short | recursive ) echo "Configuration of ags 0.4.2-61:";;
esac
cat <<\_ACEOF
@@ -1527,7 +1523,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ags configure 0.4.2-63
+ags configure 0.4.2-61
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2004,7 +2000,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 ags $as_me 0.4.2-63, which was
+It was created by ags $as_me 0.4.2-61, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2870,7 +2866,7 @@ fi
# Define the identity of the package.
PACKAGE='ags'
- VERSION='0.4.2-63'
+ VERSION='0.4.2-61'
cat >>confdefs.h <<_ACEOF
@@ -4146,65 +4142,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{
-for ac_prog in help2man
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HELP2MAN+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$HELP2MAN"; then
- ac_cv_prog_HELP2MAN="$HELP2MAN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_HELP2MAN="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-HELP2MAN=$ac_cv_prog_HELP2MAN
-if test -n "$HELP2MAN"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
-$as_echo "$HELP2MAN" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$HELP2MAN" && break
-done
-
-if ! test -z "$HELP2MAN"
-then
-MANPAGES=ags.1
-
-HAVE_HELP2MAN=true
-fi
- if test x$HAVE_HELP2MAN = xtrue; then
- HAVE_HELP2MAN_TRUE=
- HAVE_HELP2MAN_FALSE='#'
-else
- HAVE_HELP2MAN_TRUE='#'
- HAVE_HELP2MAN_FALSE=
-fi
-
-}
-
# Checks for libraries.
# FIXME: Replace `main' with a function in `-lX11':
@@ -6827,10 +6764,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_HELP2MAN_TRUE}" && test -z "${HAVE_HELP2MAN_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_HELP2MAN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -7228,7 +7161,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 ags $as_me 0.4.2-63, which was
+This file was extended by ags $as_me 0.4.2-61, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7294,7 +7227,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="\\
-ags config.status 0.4.2-63
+ags config.status 0.4.2-61
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index b43dd09..1a1f43d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([ags],[0.4.2-63],[weedlight at gmail.com])
+AC_INIT([ags],[0.4.2-61],[weedlight at gmail.com])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADERS([config.h])
@@ -12,8 +12,6 @@ AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
-AC_PROG_HELP2MAN([ags.1])
-
# Checks for libraries.
# FIXME: Replace `main' with a function in `-lX11':
AC_CHECK_LIB([X11], [main])
diff --git a/gsequencer.share/icons/ags.xpm b/gsequencer.share/icons/ags.xpm
deleted file mode 100644
index d07ff43..0000000
--- a/gsequencer.share/icons/ags.xpm
+++ /dev/null
@@ -1,92 +0,0 @@
-/* XPM */
-static char * ags_xpm[] = {
-"32 32 57 1",
-" c None",
-". c #C0C0C0",
-"+ c #C1C1C1",
-"@ c #BEBEBE",
-"# c #BDBDBD",
-"$ c #C2C2C2",
-"% c #C3C3C3",
-"& c #C7C7C7",
-"* c #FFFFFF",
-"= c #E9E9E9",
-"- c #E5E5E5",
-"; c #E7E7E7",
-"> c #E6E6E6",
-", c #F5F5F5",
-"' c #FCFCFC",
-") c #A9A9A9",
-"! c #EAEAEA",
-"~ c #E8E8E8",
-"{ c #F4F4F4",
-"] c #BCBCBC",
-"^ c #E4E4E4",
-"/ c #DADADA",
-"( c #B3B3B3",
-"_ c #A6A6A6",
-": c #FEFEFE",
-"< c #F9F9F9",
-"[ c #A1A1A1",
-"} c #EBEBEB",
-"| c #F3F3F3",
-"1 c #C5C5C5",
-"2 c #C6C6C6",
-"3 c #E2E2E2",
-"4 c #B7B7B7",
-"5 c #A7A7A7",
-"6 c #B0B0B0",
-"7 c #BABABA",
-"8 c #B4B4B4",
-"9 c #AAAAAA",
-"0 c #D6D6D6",
-"a c #BBBBBB",
-"b c #E0E0E0",
-"c c #B6B6B6",
-"d c #B2B2B2",
-"e c #C8C8C8",
-"f c #ACACAC",
-"g c #C9C9C9",
-"h c #CCCCCC",
-"i c #B5B5B5",
-"j c #D2D2D2",
-"k c #D3D3D3",
-"l c #D5D5D5",
-"m c #CBCBCB",
-"n c #DBDBDB",
-"o c #D8D8D8",
-"p c #D4D4D4",
-"q c #CFCFCF",
-"r c #CACACA",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" .++++. @#@@.+$ % ",
-" &*=-;>-,') *****!!~ {] ",
-" ^/ *(_:*<=[ }|1&222&% ",
-" 3} 4*(5*6 @.@;****+",
-" 3*'<*****(5' 7 ****&",
-" -> 8:***(9:04a]#&*b 8cde****1",
-" 4 fgha ijklllk2 mnopqrer$ ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/src/ags/X/ags_audio_preferences.c b/src/ags/X/ags_audio_preferences.c
index 1d5b7ce..265a5f6 100644
--- a/src/ags/X/ags_audio_preferences.c
+++ b/src/ags/X/ags_audio_preferences.c
@@ -414,7 +414,7 @@ ags_audio_preferences_reset(AgsApplicable *applicable)
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- "%s\0", error->message);
+ error->message);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(GTK_WIDGET(dialog));
diff --git a/src/ags/X/machine/ags_ffplayer.c b/src/ags/X/machine/ags_ffplayer.c
index 1b12d56..d99b306 100644
--- a/src/ags/X/machine/ags_ffplayer.c
+++ b/src/ags/X/machine/ags_ffplayer.c
@@ -694,7 +694,7 @@ ags_ffplayer_launch_task(AgsFileLaunch *file_launch, AgsFFPlayer *ffplayer)
&error);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_warning(error->message);
}
/* select first preset */
@@ -707,7 +707,7 @@ ags_ffplayer_launch_task(AgsFileLaunch *file_launch, AgsFFPlayer *ffplayer)
&error);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_warning(error->message);
}
/* fill ffplayer->preset */
@@ -751,7 +751,7 @@ ags_ffplayer_launch_task(AgsFileLaunch *file_launch, AgsFFPlayer *ffplayer)
&error);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_warning(error->message);
}
/* fill ffplayer->instrument */
diff --git a/src/ags/audio/ags_audio.c b/src/ags/audio/ags_audio.c
index 4994a1f..73fed40 100644
--- a/src/ags/audio/ags_audio.c
+++ b/src/ags/audio/ags_audio.c
@@ -3519,7 +3519,7 @@ ags_audio_open_files(AgsAudio *audio,
&error);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_message(error->message);
}
AGS_AUDIO_SIGNAL(audio_signal_list->data)->flags |= AGS_AUDIO_SIGNAL_TEMPLATE;
diff --git a/src/ags/audio/ags_config.c b/src/ags/audio/ags_config.c
index cba9851..61888fe 100644
--- a/src/ags/audio/ags_config.c
+++ b/src/ags/audio/ags_config.c
@@ -343,7 +343,7 @@ ags_config_save(AgsConfig *config)
&error);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_message(error->message);
//TODO:JK: do recovery
goto ags_config_save_END;
}
diff --git a/src/ags/audio/task/ags_link_channel.c b/src/ags/audio/task/ags_link_channel.c
index 987be70..6886208 100644
--- a/src/ags/audio/task/ags_link_channel.c
+++ b/src/ags/audio/task/ags_link_channel.c
@@ -152,7 +152,7 @@ ags_link_channel_launch(AgsTask *task)
&(link_channel->error));
if(link_channel->error != NULL){
- g_message("%s\0", link_channel->error->message);
+ g_message(link_channel->error->message);
}
}
diff --git a/src/ags/audio/task/ags_open_file.c b/src/ags/audio/task/ags_open_file.c
index 8fa89dc..eed5134 100644
--- a/src/ags/audio/task/ags_open_file.c
+++ b/src/ags/audio/task/ags_open_file.c
@@ -254,7 +254,7 @@ ags_open_file_launch(AgsTask *task)
&error);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_warning(error->message);
}
}
diff --git a/src/ags/audio/task/ags_open_single_file.c b/src/ags/audio/task/ags_open_single_file.c
index 40054aa..72b3ebb 100644
--- a/src/ags/audio/task/ags_open_single_file.c
+++ b/src/ags/audio/task/ags_open_single_file.c
@@ -172,7 +172,7 @@ ags_open_single_file_launch(AgsTask *task)
&error);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_warning(error->message);
}
}
diff --git a/src/ags/file/ags_file_thread.c b/src/ags/file/ags_file_thread.c
index ad7d2f4..09dd0da 100644
--- a/src/ags/file/ags_file_thread.c
+++ b/src/ags/file/ags_file_thread.c
@@ -96,6 +96,8 @@ ags_file_read_thread(AgsFile *file, xmlNode *node, AgsThread **thread)
gobject = *thread;
}
+ g_message(G_OBJECT_TYPE_NAME(gobject));
+
ags_file_add_id_ref(file,
g_object_new(AGS_TYPE_FILE_ID_REF,
"main\0", file->ags_main,
diff --git a/src/ags/file/ags_file_util.c b/src/ags/file/ags_file_util.c
index 418f62e..a1cf80c 100644
--- a/src/ags/file/ags_file_util.c
+++ b/src/ags/file/ags_file_util.c
@@ -1151,7 +1151,7 @@ ags_file_util_read_file_link_launch(AgsFileLaunch *file_launch,
NULL);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_warning(error->message);
}
}else{
g_object_set(G_OBJECT(input),
diff --git a/src/ags/lib/ags_log.c b/src/ags/lib/ags_log.c
index 9d2bdd4..696e002 100644
--- a/src/ags/lib/ags_log.c
+++ b/src/ags/lib/ags_log.c
@@ -54,23 +54,24 @@ ags_log_get_type (void)
if(!ags_type_log){
static const GTypeInfo ags_log_info = {
- sizeof(AgsLogClass),
+ sizeof (AgsLogClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) ags_log_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
- sizeof(AgsLog),
+ sizeof (AgsLog),
0, /* n_preallocs */
(GInstanceInitFunc) ags_log_init,
};
ags_type_log = g_type_register_static(G_TYPE_OBJECT,
- "AgsLog\0", &ags_log_info,
- 0);
+ "AgsLog\0",
+ &ags_log_info,
+ 0);
}
- return(ags_type_log);
+ return (ags_type_log);
}
void
diff --git a/src/ags/lib/ags_log.h b/src/ags/lib/ags_log.h
index d3f464c..a9eef66 100644
--- a/src/ags/lib/ags_log.h
+++ b/src/ags/lib/ags_log.h
@@ -135,8 +135,6 @@ struct _AgsLogFormatedMessage
char *message;
};
-GType ags_log_get_type (void);
-
void ags_log_start_queue(AgsLog *log);
void ags_log_stop_queue(AgsLog *log);
diff --git a/src/ags/main.c b/src/ags/main.c
index 50bef7c..ce92b46 100644
--- a/src/ags/main.c
+++ b/src/ags/main.c
@@ -19,8 +19,6 @@
#include <ags-lib/object/ags_connectable.h>
-#include <ags/lib/ags_log.h>
-
#include <ags/object/ags_main_loop.h>
#include <ags/plugin/ags_ladspa_manager.h>
@@ -818,27 +816,7 @@ main(int argc, char **argv)
filename = NULL;
for(i = 0; i < argc; i++){
- if(!strncmp(argv[i], "--help\0", 16)){
- printf("Advanced Gtk+ Sequencer `ags` is an audio sequencer and notation editor\n\n\0");
-
- printf("Usage:\n\t%s\n\t%s\n\t%s\n\t%s\n\nReport bugs to <jkraehemann at gmail.com>\n\0",
- "--filename file open file\0",
- "--single-thread run in single thread mode\0",
- "--help display this help and exit\0",
- "--version output version information and exit\0");
-
- exit(0);
- }else if(!strncmp(argv[i], "--version\0", 16)){
- printf("Advanced Gtk+ Sequencer 0.4.2\n\n\0");
-
- printf("%s\n%s\n%s\n\n\0",
- "Copyright (C) 2005-2015 Joël Krähemann\0",
- "This is free software; see the source for copying conditions. There is NO\0",
- "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\0");
-
- printf("Written by Joël Krähemann\n\0");
- exit(0);
- }else if(!strncmp(argv[i], "--single-thread\0", 16)){
+ if(!strncmp(argv[i], "--single-thread\0", 16)){
single_thread = TRUE;
}else if(!strncmp(argv[i], "--filename\0", 11)){
filename = argv[i + 1];
diff --git a/src/ags/plugin/ags_ladspa_manager.c b/src/ags/plugin/ags_ladspa_manager.c
index 78f4bc4..32ad958 100644
--- a/src/ags/plugin/ags_ladspa_manager.c
+++ b/src/ags/plugin/ags_ladspa_manager.c
@@ -297,7 +297,7 @@ ags_ladspa_manager_load_default_directory()
&error);
if(error != NULL){
- g_warning("%s\0", error->message);
+ g_warning(error->message);
}
while((filename = g_dir_read_name(dir)) != NULL){
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list