 +#endif
 +#endif
 diff -Naur git.orig/lib/base/encoding.cpp git/lib/base/encoding.cpp
---- git.orig/lib/base/encoding.cpp	2011-11-02 14:27:45.000000000 +0800
-+++ git/lib/base/encoding.cpp	2011-11-03 09:34:02.240827238 +0800
+--- git.orig/lib/base/encoding.cpp	2011-10-30 14:46:09.000000000 +0800
++++ git/lib/base/encoding.cpp	2011-11-03 21:15:13.530052894 +0800
 @@ -15,7 +15,17 @@
  	}
  	return c;

 		{
 			const char *provider_name = it->second->m_provider_name.length() ?
diff -Naur git.orig/lib/dvb/db.h git/lib/dvb/db.h
--- git.orig/lib/dvb/db.h	2011-11-02 14:27:45.000000000 +0800
+++ git/lib/dvb/db.h	2011-11-03 11:53:25.326297539 +0800
@@ -28,6 +28,7 @@
 	std::map<eServiceReferenceDVB, ePtr<eDVBService> > m_services;
 	

+	cn.png \
+	hk.png
diff -Naur git.orig/data/fonts/Makefile.am git/data/fonts/Makefile.am
--- git.orig/data/fonts/Makefile.am	2011-10-30 14:46:09.000000000 +0800
+++ git/data/fonts/Makefile.am	2011-11-03 21:15:13.518058916 +0800
@@ -1,8 +1,6 @@
 installdir = $(datadir)/fonts
 
