rebuild mednaffe{,-gtk2} with remove-check_version.patch

4 files changed, 206 insertions, 8 deletions

diff --git a/pcr/mednaffe-gtk2/PKGBUILD b/pcr/mednaffe-gtk2/PKGBUILD
index 67b0e9590..a55053623 100644
--- a/pcr/mednaffe-gtk2/PKGBUILD
+++ b/pcr/mednaffe-gtk2/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: MasterLaser <vaporeon@tfwno.gf>
+# Maintainer (Arch): MasterLaser <vaporeon@tfwno.gf>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=mednaffe-gtk2
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="front-end (GUI) for mednafen emulator (GTK2 Version)"
 arch=('i686' 'x86_64')
 url="https://sites.google.com/site/amatcoder/mednaffe"
@@ -11,8 +12,15 @@ install=mednaffe.install
 depends=('mednafen' 'gtk2')
 provides=('mednaffe')
 conflicts=('mednaffe')
-source=(https://sites.google.com/site/amatcoder/mednaffe/downloads/mednaffe-$pkgver.tar.gz)
-md5sums=('ab7c524d70170b8bba8819e71fc136e0')
+source=(https://sites.google.com/site/amatcoder/mednaffe/downloads/mednaffe-$pkgver.tar.gz
+        remove-check_version.patch)
+md5sums=('ab7c524d70170b8bba8819e71fc136e0'
+         'e62f04ddb2c559a1b4bf022ec7b0cc4c')
+
+prepare() {
+  cd "$srcdir"/mednaffe-$pkgver
+  patch -Np1 -i $srcdir/remove-check_version.patch
+}
 
 build() {
   cd "$srcdir"/mednaffe-$pkgver
diff --git a/pcr/mednaffe-gtk2/remove-check_version.patch b/pcr/mednaffe-gtk2/remove-check_version.patch
new file mode 100644
index 000000000..1603ce524
--- /dev/null
+++ b/pcr/mednaffe-gtk2/remove-check_version.patch
@@ -0,0 +1,91 @@
+diff -Nur a/src/mednaffe.c b/src/mednaffe.c
+--- a/src/mednaffe.c	2015-07-24 11:31:59.000000000 -0300
++++ b/src/mednaffe.c	2015-08-06 18:06:20.813682795 -0300
+@@ -550,16 +550,6 @@
+     return 1;
+   }
+ 
+-  /* Check mednafen version */
+-  if (!check_version(stout, &gui))
+-   {
+-    show_error(
+-    "Error: Mednafen version is not compatible.\nYou need 0.9.36.2 \
+-version or above.\n");
+-    return 1; /* Items are not freed here */
+-  }
+-  g_free(stout);
+-
+   /* Read configuration from mednafen-09x.cfg */
+   if (!read_cfg(&gui))
+   {
+diff -Nur a/src/toggles.c b/src/toggles.c
+--- a/src/toggles.c	2015-07-24 11:31:59.000000000 -0300
++++ b/src/toggles.c	2015-08-06 18:05:09.429070095 -0300
+@@ -376,56 +376,6 @@
+   return cfg_path;
+ }
+ 
+-gboolean check_version(gchar *stout, guidata *gui)
+-{
+-  if (stout)
+-  {
+-    if (strlen(stout)<1) return FALSE;
+-
+-    gchar **achar = g_strsplit(stout, "\n", 0);
+-    gchar **aline = g_strsplit(achar[0], " ", 2);
+-
+-    if (g_strv_length(aline)<2) return FALSE;
+-    if (strlen(aline[1])<15) return FALSE;
+-
+-    if (aline[1][11]!='9')
+-      return FALSE;
+-    if (aline[1][13]-'0'<3)
+-      return FALSE;
+-    if ((aline[1][13]=='3') && ((aline[1][14]-'0')<6))
+-      return FALSE;
+-
+-    if (strlen(aline[1])>16)
+-    {
+-      if ((aline[1][13]=='3') && (aline[1][14]=='6') && ((aline[1][16]-'0')<2))
+-        return FALSE;
+-    }
+-    else
+-    {
+-    if ((aline[1][13]=='3') && ((aline[1][14]-'0')<7))
+-      return FALSE;
+-    }
+-
+-    print_log("Version detected: ", FE, gui);
+-    print_log(aline[1], FE, gui);
+-    #ifdef G_OS_UNIX
+-      print_log("\n", FE, gui);
+-    #endif
+-    print_log("----\n", FE, gui);
+-
+-    GtkStatusbar *sbversion = GTK_STATUSBAR(gtk_builder_get_object(gui->builder, "sbversion"));
+-    gtk_statusbar_push(GTK_STATUSBAR(sbversion), 1, aline[1]);
+-
+-    gtk_widget_set_tooltip_text(GTK_WIDGET(sbversion), gui->binpath);
+-
+-    g_strfreev(achar);
+-    g_strfreev(aline);
+-
+-    return TRUE;
+-  }
+-  else return FALSE;
+-}
+-
+ gboolean read_cfg(guidata *gui)
+ {
+   gchar *string;
+diff -Nur a/src/toggles.h b/src/toggles.h
+--- a/src/toggles.h	2015-07-24 11:31:59.000000000 -0300
++++ b/src/toggles.h	2015-08-06 18:04:52.252922723 -0300
+@@ -29,7 +29,6 @@
+   void set_spin(gpointer widget, guidata *gui);
+   void set_values(GtkBuilder *builder, guidata *gui);
+   gchar* get_cfg(const gchar *home, guidata *gui);
+-  gboolean check_version(gchar *stout, guidata *gui);
+   gboolean read_cfg(guidata *gui);
+ 
+ #endif /* TOGGLES_H */
diff --git a/pcr/mednaffe/PKGBUILD b/pcr/mednaffe/PKGBUILD
index 908240c30..fb904823e 100644
--- a/pcr/mednaffe/PKGBUILD
+++ b/pcr/mednaffe/PKGBUILD
@@ -1,16 +1,24 @@
-# Maintainer: MasterLaser <vaporeon@tfwno.gf>
+# Maintainer (Arch): MasterLaser <vaporeon@tfwno.gf>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=mednaffe
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="front-end (GUI) for mednafen emulator"
 arch=('i686' 'x86_64')
 url="https://sites.google.com/site/amatcoder/mednaffe"
 license=('GPL')
 install=mednaffe.install
 depends=('mednafen' 'gtk3')
-source=(https://sites.google.com/site/amatcoder/mednaffe/downloads/mednaffe-$pkgver.tar.gz)
-md5sums=('ab7c524d70170b8bba8819e71fc136e0')
+source=(https://sites.google.com/site/amatcoder/mednaffe/downloads/mednaffe-$pkgver.tar.gz
+        remove-check_version.patch)
+md5sums=('ab7c524d70170b8bba8819e71fc136e0'
+         'e62f04ddb2c559a1b4bf022ec7b0cc4c')
+
+prepare() {
+  cd "$srcdir"/mednaffe-$pkgver
+  patch -Np1 -i $srcdir/remove-check_version.patch
+}
 
 build() {
   cd "$srcdir"/mednaffe-$pkgver
diff --git a/pcr/mednaffe/remove-check_version.patch b/pcr/mednaffe/remove-check_version.patch
new file mode 100644
index 000000000..1603ce524
--- /dev/null
+++ b/pcr/mednaffe/remove-check_version.patch
@@ -0,0 +1,91 @@
+diff -Nur a/src/mednaffe.c b/src/mednaffe.c
+--- a/src/mednaffe.c	2015-07-24 11:31:59.000000000 -0300
++++ b/src/mednaffe.c	2015-08-06 18:06:20.813682795 -0300
+@@ -550,16 +550,6 @@
+     return 1;
+   }
+ 
+-  /* Check mednafen version */
+-  if (!check_version(stout, &gui))
+-   {
+-    show_error(
+-    "Error: Mednafen version is not compatible.\nYou need 0.9.36.2 \
+-version or above.\n");
+-    return 1; /* Items are not freed here */
+-  }
+-  g_free(stout);
+-
+   /* Read configuration from mednafen-09x.cfg */
+   if (!read_cfg(&gui))
+   {
+diff -Nur a/src/toggles.c b/src/toggles.c
+--- a/src/toggles.c	2015-07-24 11:31:59.000000000 -0300
++++ b/src/toggles.c	2015-08-06 18:05:09.429070095 -0300
+@@ -376,56 +376,6 @@
+   return cfg_path;
+ }
+ 
+-gboolean check_version(gchar *stout, guidata *gui)
+-{
+-  if (stout)
+-  {
+-    if (strlen(stout)<1) return FALSE;
+-
+-    gchar **achar = g_strsplit(stout, "\n", 0);
+-    gchar **aline = g_strsplit(achar[0], " ", 2);
+-
+-    if (g_strv_length(aline)<2) return FALSE;
+-    if (strlen(aline[1])<15) return FALSE;
+-
+-    if (aline[1][11]!='9')
+-      return FALSE;
+-    if (aline[1][13]-'0'<3)
+-      return FALSE;
+-    if ((aline[1][13]=='3') && ((aline[1][14]-'0')<6))
+-      return FALSE;
+-
+-    if (strlen(aline[1])>16)
+-    {
+-      if ((aline[1][13]=='3') && (aline[1][14]=='6') && ((aline[1][16]-'0')<2))
+-        return FALSE;
+-    }
+-    else
+-    {
+-    if ((aline[1][13]=='3') && ((aline[1][14]-'0')<7))
+-      return FALSE;
+-    }
+-
+-    print_log("Version detected: ", FE, gui);
+-    print_log(aline[1], FE, gui);
+-    #ifdef G_OS_UNIX
+-      print_log("\n", FE, gui);
+-    #endif
+-    print_log("----\n", FE, gui);
+-
+-    GtkStatusbar *sbversion = GTK_STATUSBAR(gtk_builder_get_object(gui->builder, "sbversion"));
+-    gtk_statusbar_push(GTK_STATUSBAR(sbversion), 1, aline[1]);
+-
+-    gtk_widget_set_tooltip_text(GTK_WIDGET(sbversion), gui->binpath);
+-
+-    g_strfreev(achar);
+-    g_strfreev(aline);
+-
+-    return TRUE;
+-  }
+-  else return FALSE;
+-}
+-
+ gboolean read_cfg(guidata *gui)
+ {
+   gchar *string;
+diff -Nur a/src/toggles.h b/src/toggles.h
+--- a/src/toggles.h	2015-07-24 11:31:59.000000000 -0300
++++ b/src/toggles.h	2015-08-06 18:04:52.252922723 -0300
+@@ -29,7 +29,6 @@
+   void set_spin(gpointer widget, guidata *gui);
+   void set_values(GtkBuilder *builder, guidata *gui);
+   gchar* get_cfg(const gchar *home, guidata *gui);
+-  gboolean check_version(gchar *stout, guidata *gui);
+   gboolean read_cfg(guidata *gui);
+ 
+ #endif /* TOGGLES_H */