Packman Build Service PMBS

aMule.spec Changed

0001-Fix-desktop-files.patch Changed

@@ -1,25 +1,20 @@
-From a00e68e57c589a7050fe16b89db3d79a2328cbd8 Mon Sep 17 00:00:00 2001
+From c0d544359e2f65e01496bf222a2753dce5855a37 Mon Sep 17 00:00:00 2001
 From: Johannes Obermayr <johannesobermayr@gmx.de>
 Date: Sun, 14 Sep 2014 03:25:32 +0200
-Subject: [PATCH] Fix desktop files.
+Subject: [PATCH 1/2] Fix desktop files.
 
 ---
- amule.desktop                      |  8 ++++----
+ amule.desktop                      |  6 +++---
  amulegui.desktop                   | 10 +++++-----
  src/utils/aLinkCreator/alc.desktop | 10 +++++-----
  src/utils/wxCas/wxcas.desktop      | 10 +++++-----
- 4 files changed, 19 insertions(+), 19 deletions(-)
+ 4 files changed, 18 insertions(+), 18 deletions(-)
 
 diff --git a/amule.desktop b/amule.desktop
-index 70be367..dfaf90e 100644
+index 70be367..e15de2d 100644
 --- a/amule.desktop
 +++ b/amule.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
- Name=aMule
- Exec=amule
--Icon=amule
-+Icon=amulegui
+@@ -5,6 +5,6 @@ Icon=amule
  Terminal=false
  Type=Application
  Categories=Network;P2P;

aMule.tar.xz/.svn-revision Changed

aMule.tar.xz/acinclude.m4 Changed

aMule.tar.xz/config.h.in Changed

aMule.tar.xz/configure Changed

@@ -2502,45 +2502,6 @@
 
 } # ac_fn_cxx_check_header_compile
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $2
-  (void) $2;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_decl
-
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2607,6 +2568,45 @@
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_func
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $2
+  (void) $2;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -12050,19 +12050,11 @@
 
 
 
-	if test ${enable_mmap:-no} = yes; then :
 
-		for ac_header in sys/mman.h
-do :
-  ac_fn_cxx_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mman_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_MMAN_H 1
-_ACEOF
 
-fi
+	if test ${enable_mmap:-no} = yes; then :
 
-done
+		$as_echo "#define ENABLE_MMAP 1" >>confdefs.h
 
 
 for ac_func in getpagesize
@@ -12113,10 +12105,7 @@
    * how to use it (BSD variants)  */
 
 #include <fcntl.h>
-
-#ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
-#endif
 
 #if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
 char *malloc ();
@@ -12328,11 +12317,6 @@
 
 fi
 
-else
-
-		# fake the result of the test for munmap() for the gettext macros
-		ac_cv_func_munmap=no
-
 fi
 
 fi
@@ -12349,7 +12333,9 @@
 /* end confdefs.h.  */
 
 
-			#define _GNU_SOURCE
+			#ifndef _GNU_SOURCE
+			#	define _GNU_SOURCE
+			#endif
 			#ifdef HAVE_FCNTL_H
 			#  include <fcntl.h>
 			#endif
@@ -12466,6 +12452,12 @@
 fi
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 # Checking Native Language Support
 
 
@@ -12689,7 +12681,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_cposix_strerror=yes
 else
   ac_cv_lib_cposix_strerror=no
@@ -12709,7 +12701,7 @@
 
 for ac_func in getpagesize
 do :
-  ac_fn_cxx_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
 if test "x$ac_cv_func_getpagesize" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPAGESIZE 1
@@ -12864,7 +12856,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_mmap_fixed_mapped=yes
 else
   ac_cv_func_mmap_fixed_mapped=no
@@ -12976,7 +12968,7 @@
 }
 
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"; then :
   gt_cv_int_divbyzero_sigfpe=yes
 else
   gt_cv_int_divbyzero_sigfpe=no
@@ -13017,7 +13009,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   jm_ac_cv_header_inttypes_h=yes
 else
   jm_ac_cv_header_inttypes_h=no
@@ -13052,7 +13044,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   jm_ac_cv_header_stdint_h=yes
 else
   jm_ac_cv_header_stdint_h=no
@@ -13087,7 +13079,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_type_unsigned_long_long=yes
 else
   ac_cv_type_unsigned_long_long=no
@@ -13137,7 +13129,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   gt_cv_header_inttypes_h=yes
 else
   gt_cv_header_inttypes_h=no
@@ -13179,7 +13171,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   gt_cv_inttypes_pri_broken=no
 else
   gt_cv_inttypes_pri_broken=yes
@@ -13734,7 +13726,7 @@
 stdlib.h string.h unistd.h sys/param.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 eval as_val=\$$as_ac_Header
    if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -13750,7 +13742,7 @@
 strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 eval as_val=\$$as_ac_var
    if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
@@ -13813,7 +13805,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_func_iconv=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -13835,7 +13827,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 fi
@@ -13895,7 +13887,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   am_cv_proto_iconv_arg1=""
 else
   am_cv_proto_iconv_arg1="const"
@@ -13933,7 +13925,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_langinfo_codeset=yes
 else
   am_cv_langinfo_codeset=no
@@ -13968,7 +13960,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_val_LC_MESSAGES=yes
 else
   am_cv_val_LC_MESSAGES=no
@@ -14135,7 +14127,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_gnugettext2_libc=yes
 else
   gt_cv_func_gnugettext2_libc=no
@@ -14553,7 +14545,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_gnugettext2_libintl=yes
 else
   gt_cv_func_gnugettext2_libintl=no
@@ -14580,7 +14572,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext2_libintl=yes
@@ -14941,6 +14933,12 @@
 fi
 
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 
 
 # Check for bfd.h (to have proper backtraces without using wxExecute)

aMule.tar.xz/configure.in Changed

aMule.tar.xz/m4/fallocate.m4 Changed

aMule.tar.xz/src/ExternalConnector.cpp Changed

aMule.tar.xz/src/FileArea.cpp Changed

@@ -39,23 +39,25 @@
 #include "FileArea.h"		// Interface declarations.
 #include "FileAutoClose.h"	// Needed for CFileAutoClose
 
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
+#ifndef ENABLE_MMAP
+#	define ENABLE_MMAP	0
 #endif
 
-#ifdef HAVE_MMAP
-#	if defined(HAVE_SYSCONF) && defined(HAVE__SC_PAGESIZE)
+#define USE_MMAP	(ENABLE_MMAP && defined(HAVE_MMAP) && defined(HAVE_SYSCONF) && (defined(HAVE__SC_PAGESIZE) || defined(HAVE__SC_PAGE_SIZE)))
+
+#if USE_MMAP
+
+#include <sys/mman.h>
+
+#if defined(HAVE_SYSCONF) && defined(HAVE__SC_PAGESIZE)
 static const long gs_pageSize = sysconf(_SC_PAGESIZE);
-#	elif defined(HAVE_SYSCONF) && defined(HAVE__SC_PAGE_SIZE)
+#elif defined(HAVE_SYSCONF) && defined(HAVE__SC_PAGE_SIZE)
 static const long gs_pageSize = sysconf(_SC_PAGE_SIZE);
-#	elif defined(HAVE_GETPAGESIZE)
-static const int gs_pageSize = getpagesize();
-#	else
-#		error "Should use memory mapped files but don't know how to determine page size!"
-#	endif
 #endif
 
-#if !defined(HAVE_SIGACTION) || !defined(SA_SIGINFO) || !defined(HAVE_MMAP) || defined(__UCLIBC__)
+#endif /* USE_MMAP */
+
+#if !defined(HAVE_SIGACTION) || !defined(SA_SIGINFO) || !USE_MMAP || defined(__UCLIBC__)
 
 class CFileAreaSigHandler
 {
@@ -198,7 +200,7 @@
 		delete[] m_buffer;
 		m_buffer = NULL;
 	}
-#ifdef HAVE_MMAP
+#if USE_MMAP
 	if (m_mmap_buffer)
 	{
 		munmap(m_mmap_buffer, m_length);
@@ -220,7 +222,7 @@
 {
 	Close();
 
-#ifdef HAVE_MMAP
+#if USE_MMAP
 	uint64 offEnd = offset + count;
 	if (gs_pageSize > 0 && offEnd < 0x100000000ull) {
 		uint64 offStart = offset & (~((uint64)gs_pageSize-1));
@@ -242,7 +244,7 @@
 	file.ReadAt(m_buffer, offset, count);
 }
 
-#ifdef HAVE_MMAP
+#if USE_MMAP
 void CFileArea::StartWriteAt(CFileAutoClose& file, uint64 offset, size_t count)
 {
 	Close();
@@ -280,7 +282,7 @@
 	if (!m_buffer)
 		return false;
 
-#ifdef HAVE_MMAP
+#if USE_MMAP
 	if (m_mmap_buffer) {
 		if (msync(m_mmap_buffer, m_length, MS_SYNC))
 			return false;

aMule.tar.xz/src/TextClient.cpp Changed

@@ -529,7 +529,9 @@
 			}
 			break;
 		case CMD_ID_SEARCH:
-			printf("No search type defined.\nType 'help search' to get more help.\n");
+			/* TRANSLATORS:
+			   'help search' is a command to the program, do not translate it. */
+			Show(_("No search type defined.\nType 'help search' to get more help.\n"));
 			break;
 
 
@@ -548,7 +550,7 @@
 				if (args.ToULong(&id) == true && id < m_Results_map.size()) {
 
 					SearchFile* file = m_Results_map[id];
-					printf("Download File: %lu %s\n", id, (const char*)unicode2char(file->sFileName));
+					Show(CFormat(_("Download File: %lu %s\n")) % id % file->sFileName);
 					request = new CECPacket(EC_OP_DOWNLOAD_SEARCH_RESULT);
 					// get with id the hash and category=0
 					uint32 category = 0;
@@ -895,9 +897,9 @@
 	tmp2 = tmp->AddCommand(wxT("BwLimit"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Set bandwidth limits."),
 			       wxTRANSLATE("The value given to these commands has to be in kilobytes/sec.\n"), CMD_PARAM_NEVER);
 	tmp2->AddCommand(wxT("Up"), CMD_ID_SET_BWLIMIT_UP, wxTRANSLATE("Set upload bandwidth limit."),
-			 wxT("The given value must be in kilobytes/sec.\n"), CMD_PARAM_ALWAYS);
+			 wxTRANSLATE("The given value must be in kilobytes/sec.\n"), CMD_PARAM_ALWAYS);
 	tmp2->AddCommand(wxT("Down"), CMD_ID_SET_BWLIMIT_DOWN, wxTRANSLATE("Set download bandwidth limit."),
-			 wxT("The given value must be in kilobytes/sec.\n"), CMD_PARAM_ALWAYS);
+			 wxTRANSLATE("The given value must be in kilobytes/sec.\n"), CMD_PARAM_ALWAYS);
 
 	tmp = m_commands.AddCommand(wxT("Get"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Get and display a preference value."),
 				    wxEmptyString, CMD_PARAM_NEVER);

aMule.tar.xz/src/amule.cpp Changed

Changes of Revision 19