Version 0.29.140.29.14

11 files changed, 149 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index 4fd1ece6..dde206d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 MyRuLib: свободная (бесплатная и открытая) программа для 

 организации домашней библиотеки (коллекции) электронных книг.

 

-==== Версия 0.29.12 (21.07.2013 г.) ====

+==== Версия 0.29.14 (21.07.2013 г.) ====

+Доработки и исправление ошибок:

+* Компиляция программы для MacOS с поддержкой CREngine.

+* Ошибка компоновки MyRuLibCR c библиотеками: libjpeg, libpng.

+

+==== Версия 0.29.13 (21.07.2013 г.) ====

 Доработки и исправление ошибок:

 * Простая компиляция программы для MacOS.

 * Размер кнопок панели инструментов изменен на стандартный.

diff --git a/Makefile.in b/Makefile.in
index 27f09a56..0eadfc7f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,9 +90,7 @@ MRL_SQLITE3_CFLAGS = -DSQLITE_ENABLE_FTS3 -I$(srcdir)/3rdparty/sqlite3 \
 MRL_SQLITE3_OBJECTS =  \
 	mrl_sqlite3_sqlite3.o
 MRL_CRENGINE_CXXFLAGS = -I3rdparty/crengine/include \
-	-I$(srcdir)/../wxWidgets/src/jpeg -I$(srcdir)/../wxWidgets/src/png \
-	-I$(srcdir)/../wxWidgets/src/zlib -I$(srcdir)/3rdparty/crengine/png \
-	$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+	-I$(srcdir)/3rdparty/crengine/png $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 MRL_CRENGINE_OBJECTS =  \
 	mrl_crengine_chmfmt.o \
 	mrl_crengine_cp_stats.o \
diff --git a/configure b/configure
index ea9ea681..976aebc2 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 MyRuLib 0.29.13.
+# Generated by GNU Autoconf 2.69 for MyRuLib 0.29.14.
 #
 # Report bugs to <mail@lintest.ru>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='MyRuLib'
 PACKAGE_TARNAME='myrulib'
-PACKAGE_VERSION='0.29.13'
-PACKAGE_STRING='MyRuLib 0.29.13'
+PACKAGE_VERSION='0.29.14'
+PACKAGE_STRING='MyRuLib 0.29.14'
 PACKAGE_BUGREPORT='mail@lintest.ru'
 PACKAGE_URL='http://myrulib.lintest.ru/'
 
@@ -1364,7 +1364,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 MyRuLib 0.29.13 to adapt to many kinds of systems.
+\`configure' configures MyRuLib 0.29.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1430,7 +1430,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of MyRuLib 0.29.13:";;
+     short | recursive ) echo "Configuration of MyRuLib 0.29.14:";;
    esac
   cat <<\_ACEOF
 
@@ -1558,7 +1558,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-MyRuLib configure 0.29.13
+MyRuLib configure 0.29.14
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1935,7 +1935,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 MyRuLib $as_me 0.29.13, which was
+It was created by MyRuLib $as_me 0.29.14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -9243,6 +9243,102 @@ fi
 
 
 if test "x$USE_READER" = "xyes" ; then
+  if test "x$WX_LIBS_STATIC" = "x"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_std_error in -ljpeg" >&5
+$as_echo_n "checking for jpeg_std_error in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_std_error+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_std_error ();
+int
+main ()
+{
+return jpeg_std_error ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jpeg_jpeg_std_error=yes
+else
+  ac_cv_lib_jpeg_jpeg_std_error=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_std_error" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_std_error" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_std_error" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBJPEG 1
+_ACEOF
+
+  LIBS="-ljpeg $LIBS"
+
+else
+  as_fn_error $? "no jpeglib.h; please install libjpeg62-dev or equivalent" "$LINENO" 5
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5
+$as_echo_n "checking for png_sig_cmp in -lpng... " >&6; }
+if ${ac_cv_lib_png_png_sig_cmp+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_sig_cmp ();
+int
+main ()
+{
+return png_sig_cmp ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_png_png_sig_cmp=yes
+else
+  ac_cv_lib_png_png_sig_cmp=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5
+$as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; }
+if test "x$ac_cv_lib_png_png_sig_cmp" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPNG 1
+_ACEOF
+
+  LIBS="-lpng $LIBS"
+
+else
+  as_fn_error $? "no png.h; please install libpng12-dev or equivalent" "$LINENO" 5
+fi
+
+  fi
   CXXFLAGS="$CXXFLAGS -DFB_INCLUDE_READER -I\$(srcdir)/3rdparty/crengine/include"
   WX_LIBS="$WX_LIBS -lmrl_crengine"
   $as_echo "#define FB_INCLUDE_READER 1" >>confdefs.h
@@ -9809,7 +9905,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 MyRuLib $as_me 0.29.13, which was
+This file was extended by MyRuLib $as_me 0.29.14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9872,7 +9968,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="\\
-MyRuLib config.status 0.29.13
+MyRuLib config.status 0.29.14
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index 894f6a0e..9b47b4e0 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 
-AC_INIT([MyRuLib],[0.29.13],[mail@lintest.ru],[myrulib],[http://myrulib.lintest.ru/])
+AC_INIT([MyRuLib],[0.29.14],[mail@lintest.ru],[myrulib],[http://myrulib.lintest.ru/])
 
 dnl Set the minimum version of toolkit libs
 dnl ========================================================
@@ -285,6 +285,10 @@ dnl === USE_READER ===
 dnl ==================
 
 if test "x$USE_READER" = "xyes" ; then 
+  if test "x$WX_LIBS_STATIC" = "x"; then
+    AC_CHECK_LIB(jpeg, jpeg_std_error, , AC_MSG_ERROR([no jpeglib.h; please install libjpeg62-dev or equivalent]))
+    AC_CHECK_LIB(png, png_sig_cmp, , AC_MSG_ERROR([no png.h; please install libpng12-dev or equivalent]))
+  fi
   CXXFLAGS="$CXXFLAGS -DFB_INCLUDE_READER -I\$(srcdir)/3rdparty/crengine/include"
   WX_LIBS="$WX_LIBS -lmrl_crengine"
   AC_DEFINE(FB_INCLUDE_READER)
diff --git a/debian/changelog b/debian/changelog
index 774fecb8..1a305c5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+myrulib (0.29.14-squeeze1) stable; urgency=low
+
+  Исправление ошибок:
+  * Ошибка компоновки MyRuLibCR c библиотеками: libjpeg, libpng.
+
+ -- Denis Kandrashin <mail@lintest.ru>  Sun, 21 Jul 2013 18:42:01 +0400
+
 myrulib (0.29.13-squeeze1) stable; urgency=low
 
   Доработки и исправление ошибок:
diff --git a/myrulib.bkl b/myrulib.bkl
index c00ad18b..46adb80f 100644
--- a/myrulib.bkl
+++ b/myrulib.bkl
@@ -70,9 +70,6 @@
 
 	<lib id="mrl_crengine" template="wx-lib" cond="USE_READER=='yes'">
 		<include>3rdparty/crengine/include</include>
-		<include>$(SRCDIR)/../wxWidgets/src/jpeg</include>
-		<include>$(SRCDIR)/../wxWidgets/src/png</include>
-		<include>$(SRCDIR)/../wxWidgets/src/zlib</include>
 		<include>$(SRCDIR)/3rdparty/crengine/png</include>
 		<sources>3rdparty/crengine/src/chmfmt.cpp</sources>
 		<sources>3rdparty/crengine/src/cp_stats.cpp</sources>
diff --git a/rpmbuild/myrulib-cr.spec b/rpmbuild/myrulib-cr.spec
index c76e7d1d..63a147c5 100644
--- a/rpmbuild/myrulib-cr.spec
+++ b/rpmbuild/myrulib-cr.spec
@@ -7,7 +7,7 @@
 #
 
 Name:           myrulib-cr
-Version:        0.29.13
+Version:        0.29.14
 Release:        0
 License:        GPL-3.0
 Summary:        E-Book Library Manager
diff --git a/rpmbuild/myrulib.spec b/rpmbuild/myrulib.spec
index 78a4e612..8f36c2d2 100644
--- a/rpmbuild/myrulib.spec
+++ b/rpmbuild/myrulib.spec
@@ -7,7 +7,7 @@
 #
 
 Name:           myrulib
-Version:        0.29.13
+Version:        0.29.14
 Release:        0
 License:        GPL-3.0
 Summary:        E-Book Library Manager
diff --git a/sources/MyRuLib/FbMainFrame.cpp b/sources/MyRuLib/FbMainFrame.cpp
index b56edf85..861ee211 100644
--- a/sources/MyRuLib/FbMainFrame.cpp
+++ b/sources/MyRuLib/FbMainFrame.cpp
@@ -279,13 +279,18 @@ void FbMainFrame::RestoreFrameList()
 

 bool FbMainFrame::Create(wxWindow * parent, wxWindowID id, const wxString & title)

 {

-	wxSize size;

-	bool maximized = FbParams(FB_FRAME_MAXIMIZE);

+#ifdef __WXMAC__

+    wxSize size = wxSize(800,600);

+    bool maximized = false;

+#else

+    wxSize size = wxDefaultSize;

+    bool maximized = FbParams(FB_FRAME_MAXIMIZE);

 	if (maximized) {

 		size = wxSize( FbParamItem::DefaultInt(FB_FRAME_WIDTH), FbParamItem::DefaultInt(FB_FRAME_HEIGHT) );

 	} else {

 		size = wxSize( FbParams(FB_FRAME_WIDTH), FbParams(FB_FRAME_HEIGHT) );

 	}

+#endif __WXMAC__

 

 	bool res = wxFrame::Create(parent, id, title, wxDefaultPosition, size, wxDEFAULT_FRAME_STYLE|wxFRAME_NO_WINDOW_MENU);

 	if(res)	{

diff --git a/windows.sh b/windows.sh
index 8b019144..d9981bcc 100755
--- a/windows.sh
+++ b/windows.sh
@@ -40,7 +40,6 @@ if test "x$EXISTS_WXW" != "x$WXW_VERSION" ; then
   rm $WXW_FILENAME.tar.bz2
   wget http://sourceforge.net/projects/wxwindows/files/$WXW_VERSION/$WXW_FILENAME.tar.bz2
   tar -xvjf $WXW_FILENAME.tar.bz2
-  ln -s $WXW_FILENAME wxWidgets
   cd $WXW_FILENAME
   mkdir build_msw
   cd build_msw
@@ -105,7 +104,12 @@ cd $SOURCE_DIR
 rm -rf build_cr3
 mkdir build_cr3
 cd build_cr3
-LDFLAGS="-static-libgcc -static-libstdc++" ../configure \
+CXXFLAGS="-I$BUILD_DIR/$WXW_FILENAME/src/\
+ -I$BUILD_DIR/$WXW_FILENAME/src/jpeg\
+ -I$BUILD_DIR/$WXW_FILENAME/src/png\
+ -I$BUILD_DIR/$WXW_FILENAME/src/zlib" \
+    LDFLAGS="-static-libgcc -static-libstdc++" \
+    ../configure \
     --with-expat \
     --host=i686-w64-mingw32 \
     --with-wx-prefix=$BUILD_DIR \
@@ -115,3 +119,4 @@ LDFLAGS="-static-libgcc -static-libstdc++" ../configure \
     --with-reader
 make
 zip $BUILD_DIR/myrulib-cr_$MRL_VERSION-win32.exe.zip myrulib.exe
+
diff --git a/xcode.sh b/xcode.sh
index be7357db..664e45d2 100755
--- a/xcode.sh
+++ b/xcode.sh
@@ -21,7 +21,7 @@ MAC_SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk"
 MAC_SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk"
 
 SOURCE_DIR=`pwd`
-
+		
 cd ~
 
 mkdir $MRL_FILENAME
@@ -69,21 +69,6 @@ if test "x$EXISTS_WXW" != "x$WXW_VERSION" ; then
 
 fi
 
-cd $SOURCE_DIR
-rm -rf build_mac
-mkdir build_mac
-cd build_mac
-arch_flags="-arch i386"
-../configure \
-    CFLAGS="$arch_flags" CXXFLAGS="$arch_flags" CPPFLAGS="$arch_flags" \
-    LDFLAGS="$arch_flags" OBJCFLAGS="$arch_flags" OBJCXXFLAGS="$arch_flags" \
-    --with-wx-prefix=$BUILD_DIR \
-    --with-macosx-sdk=$MAC_SDK_PATH \
-    --with-macosx-version-min=10.6 \
-    --with-locale
-make
-make install
-
 ##################################################################
 # FreeType2
 ##################################################################
@@ -100,8 +85,8 @@ if test "x$EXISTS_FT2" != "x$FT2_VERSION" ; then
   curl -LO http://sourceforge.net/projects/freetype/files/freetype2/$FT2_VERSION/$FT2_FILENAME.tar.bz2
   tar -xvjf $FT2_FILENAME.tar.bz2
   cd $FT2_FILENAME
-  mkdir build_msw
-  cd build_msw
+  mkdir build_mac
+  cd build_mac
   ../configure \
     CFLAGS="$arch_flags" CXXFLAGS="$arch_flags" CPPFLAGS="$arch_flags" \
     LDFLAGS="$arch_flags" OBJCFLAGS="$arch_flags" OBJCXXFLAGS="$arch_flags" \
@@ -126,6 +111,7 @@ cd build_mac
 ../configure \
     CFLAGS="$arch_flags" CXXFLAGS="$arch_flags" CPPFLAGS="$arch_flags" \
     LDFLAGS="-static-libgcc -static-libstdc++ $arch_flags" OBJCFLAGS="$arch_flags" OBJCXXFLAGS="$arch_flags" \
+    --with-wx-prefix=$BUILD_DIR \
     --with-expat \
     --with-bzip2 \
     --with-locale
@@ -136,7 +122,11 @@ rm -rf build_cr3
 mkdir build_cr3
 cd build_cr3
 ../configure \
-    CFLAGS="$arch_flags" CXXFLAGS="$arch_flags" CPPFLAGS="$arch_flags" \
+  CXXFLAGS="$arch_flags -I$BUILD_DIR/$WXW_FILENAME/src/\
+  -I$BUILD_DIR/$WXW_FILENAME/src/jpeg\
+  -I$BUILD_DIR/$WXW_FILENAME/src/png\
+  -I$BUILD_DIR/$WXW_FILENAME/src/zlib" \
+    CFLAGS="$arch_flags" CPPFLAGS="$arch_flags" \
     LDFLAGS="-static-libgcc -static-libstdc++ $arch_flags" OBJCFLAGS="$arch_flags" OBJCXXFLAGS="$arch_flags" \
     --with-wx-prefix=$BUILD_DIR \
     --with-ft-prefix=$BUILD_DIR \