Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/pidgin-musictracker-01-solaris.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1775 a66fe7a221a5
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
     1
 
--- pidgin-musictracker-0.4.16/src/Makefile.am.old	2009-03-07 11:50:40.570421185 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
     2
 
+++ pidgin-musictracker-0.4.16/src/Makefile.am	2009-03-07 11:51:43.859862568 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
     3
 
@@ -42,8 +42,7 @@
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
     4
 
 AM_CPPFLAGS = \
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
     5
 
         -DDATADIR=\"$(PIDGIN_DATADIR)\" \
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
     6
 
 	-DLOCALEDIR=\"$(localedir)\" \
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
     7
 
-	$(WERROR_CFLAGS) -W -Wall -Wno-unused-parameter \
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
     8
 
-	-std=gnu99 \
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
     9
 
+	$(WERROR_CFLAGS) \
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    10
 
         $(PIDGIN_CFLAGS) \
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    11
 
         $(GLIB_CFLAGS) \
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    12
 
 		$(GTK_CFLAGS) \
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    13
 
--- pidgin-musictracker-0.4.16/src/Makefile.in.old	2009-03-07 11:51:57.973830553 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    14
 
+++ pidgin-musictracker-0.4.16/src/Makefile.in	2009-03-07 11:52:42.076543323 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    15
 
@@ -267,8 +267,7 @@
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    16
 
 AM_CPPFLAGS = \
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    17
 
         -DDATADIR=\"$(PIDGIN_DATADIR)\" \
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    18
 
 	-DLOCALEDIR=\"$(localedir)\" \
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    19
 
-	$(WERROR_CFLAGS) -W -Wall -Wno-unused-parameter \
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    20
 
-	-std=gnu99 \
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    21
 
+	$(WERROR_CFLAGS)
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    22
 
         $(PIDGIN_CFLAGS) \
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    23
 
         $(GLIB_CFLAGS) \
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    24
 
 		$(GTK_CFLAGS) \
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    25
 
--- pidgin-musictracker-0.4.16/src/musictracker.c.old	2009-03-07 11:53:02.791621799 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    26
 
+++ pidgin-musictracker-0.4.16/src/musictracker.c	2009-03-07 11:53:51.786585501 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    27
 
@@ -214,8 +214,13 @@
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    28
 
 	buf[10] = 0;
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    29
 
 	status = put_field(status, 'b', buf);
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    30
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    31
 
-        // Music symbol: U+266B 'beamed eighth notes'
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    32
 
-	status = put_field(status, 'm', "\u266b");
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    33
 
+        char symbol[4];
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    34
 
+        symbol[0] = 0xE2;
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    35
 
+        symbol[1] = 0x99;
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    36
 
+        symbol[2] = 0xAB;
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    37
 
+        symbol[3] = 0;
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    38
 
+
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    39
 
+	status = put_field(status, 'm', symbol);
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    40
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    41
 
 	trace("Formatted status: %s", status);
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    42
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    43
 
--- pidgin-musictracker-0.4.16/src/xmmsctrl.c.old	2009-03-07 11:54:10.758787842 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    44
 
+++ pidgin-musictracker-0.4.16/src/xmmsctrl.c	2009-03-07 11:55:38.619789241 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    45
 
@@ -76,9 +76,9 @@
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    46
 
 			}
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    47
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    48
 
                         char regexp[100];
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    49
 
-                        sprintf(regexp, "^(.*)\\%s(.*)\\%s(.*)$", sep, sep);
1775
a66fe7a221a5 2009-03-24 Andras Barna <[email protected]>
sartek
parents: 1719
diff changeset 
    50
 
+                        sprintf(regexp, "^(.*)\\%s(.*)$", sep);
1463
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    51
 
                         pcre *re = regex(regexp, 0);
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    52
 
-                        capture(re, title, strlen(title), ti->artist, ti->album, ti->track);
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    53
 
+                        capture(re, title, strlen(title), ti->artist, ti->track);
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    54
 
                         pcre_free(re);
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    55
 
 		}
948f6b459662 2008-10-29 Andras Barna <[email protected]>
sartek
parents:
diff changeset 
    56
1719
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    57
 
--- pidgin-musictracker-0.4.16/src/utils.h.old	2009-03-07 12:16:06.309532150 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    58
 
+++ pidgin-musictracker-0.4.16/src/utils.h	2009-03-07 12:16:11.625132535 +0200
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    59
 
@@ -2,7 +2,7 @@
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    60
 
 #define _UTILS_H_
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    61
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    62
 
 #include <stdio.h>
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    63
 
-#include <pcre.h>
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    64
 
+#include <pcre/pcre.h>
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    65
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    66
 
 #ifndef WIN32
7c905d664fd9 2009-03-07 Andras Barna <[email protected]>
sartek
parents: 1463
diff changeset 
    67
 
 #include <dbus/dbus-glib.h>
upstream/spec-files-extra