HGKeeper

grim/guifications2

[gf2-migrate @ 86]
org.guifications.gf2
2006-09-18, Daniel Atallah

84b06c0b0dd8

Parents bda8906b6b08
Children c65c47f1a5cc

[gf2-migrate @ 86]
fix win32 compilation with gaim trunk

13 files changed, 84 insertions(+), 78 deletions(-)

+5 -2

Makefile.mingw

+1 -1

guifications-installer.nsi

+7 -1

pixmaps/Makefile.mingw

+10 -30

+19 -35

+1 -1

+1 -1

+3 -1

themes/Makefile.mingw

+7 -1

themes/Penguins/Makefile.mingw

+8 -1

themes/default/Makefile.mingw

+8 -2

themes/funky/Makefile.mingw

+7 -1

themes/item_test/Makefile.mingw

+7 -1

themes/mini/Makefile.mingw

~~--- a/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -13,13 +13,16 @@

GF_THEMES := ./themes

GF_PO := ./po

~~-MAKENSIS := makensis.exe~~

+GAIM_TOP := ../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

## VARIABLE DEFINITIONS

GF_VERSION := $(shell cat ./VERSION)

~~-GAIM_VERSION := $(shell cat ../../VERSION)~~

+.PHONY: all install installer clean

all:

cp gf_config.h.mingw gf_config.h

~~--- a/guifications-installer.nsi Thu Sep 07 03:16:31 2006 -0400~~

+++ b/guifications-installer.nsi Mon Sep 18 00:49:27 2006 -0400

@@ -37,7 +37,7 @@

;-------------------------------

; Gaim Plugin installer helper stuff

~~- !addincludedir "../../src/win32/nsis"~~

+ !addincludedir "../../win32/nsis"

!include "gaim-plugin.nsh"

;--------------------------------

~~--- a/pixmaps/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/pixmaps/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -3,9 +3,15 @@

# Description: Makefile for guifications pixmaps

~~-GAIM_DATADIR = ../../../win32-install-dir~~

+GAIM_TOP = ../../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

+GAIM_DATADIR = $(GAIM_INSTALL_DIR)

include ./Makefile.am

+.PHONY: install

install:

if test '$(guificationsconfpix_DATA)'; then \

mkdir -p $(guificationsconfpixdir); \

~~--- a/po/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/po/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -1,31 +1,16 @@

# Makefile.mingw

# Description: Makefile to generate mo files

+GAIM_TOP = ../../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

PACKAGE = guifications

~~-##~~

~~-## PATHS~~

~~-##~~

~~-srcdir = .~~

~~-GAIM_TOP = ../../..~~

~~-GAIM_INSTALL_DIR = $(GAIM_TOP)/win32-install-dir~~

~~-LOCALEDIR = $(GAIM_INSTALL_DIR)/locale~~

~~-GTK_BIN = $(GAIM_TOP)/../win32-dev/gtk_2_0/bin~~

~~-##~~

~~-## TOOLS~~

~~-##~~

~~-GMSGFMT := $(GTK_BIN)/msgfmt~~

.SUFFIXES:

.SUFFIXES: .po .gmo

## SOURCES, OBJECTS

@@ -39,29 +24,24 @@

.po.gmo:

rm -f $@ && $(GMSGFMT) --statistics -o $@ $<

## TARGETS

+.PHONY: all install clean

all: $(CATALOGS)

install: all

~~- mkdir -p $(LOCALEDIR)~~

+ mkdir -p $(GAIM_INSTALL_PO_DIR)

@catalogs='$(CATALOGS)'; \

for cat in $$catalogs; do \

cat=`basename $$cat`; \

lang=`echo $$cat | sed 's/\.gmo$$//'`; \

~~- dir=$(LOCALEDIR)/$$lang/LC_MESSAGES; \~~

+ dir=$(GAIM_INSTALL_PO_DIR)/$$lang/LC_MESSAGES; \

mkdir -p $$dir; \

~~- if test -r $$cat; then \~~

~~- cp $$cat $$dir/$(PACKAGE).mo; \~~

~~- echo "installing $$cat as $$dir/$(PACKAGE).mo"; \~~

~~- else \~~

~~- cp $(srcdir)/$$cat $$dir/$(PACKAGE).mo; \~~

~~- echo "installing $(srcdir)/$$cat as" \~~

~~- "$$dir/$(PACKAGE).mo"; \~~

~~- fi; \~~

+ cp $$cat $$dir/$(PACKAGE).mo; \

+ echo "installing $$cat as $$dir/$(PACKAGE).mo"; \

done

clean:

~~--- a/src/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/src/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -9,10 +9,8 @@

GF_TOP := ../

~~-GTK_TOP := ../../../../win32-dev/gtk_2_0~~

~~-GAIM_TOP := ../../..~~

~~-GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir~~

~~-DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins~~

+GAIM_TOP := ../../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

GF_VERSION := $(shell cat ${GF_TOP}/VERSION)

@@ -26,23 +24,22 @@

CFLAGS =

~~-DEFINES = -DGF_VERSION=\"$(GF_VERSION)\"~~

+DEFINES = -DGF_VERSION=\"$(GF_VERSION)\" -DGETTEXT_PACKAGE=\"$(GF)\" -DHAVE_CONFIG_H

LDFLAGS =

#-mwindows

~~-## INCLUDE MAKEFILES~~

~~-##~~

~~-include $(GAIM_TOP)/src/win32/global.mak~~

~~-##~~

## INCLUDE PATHS

INCLUDE_PATHS += -I. \

+ -I$(GAIM_TOP) \

+ -I$(GAIM_LIB_TOP) \

+ -I$(GAIM_LIB_TOP)/win32 \

+ -I$(GAIM_GTK_TOP) \

+ -I$(GAIM_GTK_TOP)/win32 \

-I$(GTK_TOP)/include \

-I$(GTK_TOP)/include/gtk-2.0 \

-I$(GTK_TOP)/include/glib-2.0 \

@@ -51,14 +48,13 @@

-I$(GTK_TOP)/include/freetype2 \

-I$(GTK_TOP)/lib/glib-2.0/include \

-I$(GTK_TOP)/lib/gtk-2.0/include \

~~- -I$(GAIM_TOP)/src \~~

~~- -I$(GAIM_TOP)/src/win32 \~~

-I$(GAIM_TOP)

LIB_PATHS = \

~~- -L$(GTK_TOP)/lib \~~

~~- -L$(GAIM_TOP)/src~~

+ -L$(GAIM_LIB_TOP) \

+ -L$(GAIM_GTK_TOP) \

+ -L$(GTK_TOP)/lib

@@ -104,19 +100,14 @@

-lpangoft2-1.0 \

-lgdk-win32-2.0 \

-lgdk_pixbuf-2.0 \

~~- -lgmodule-2.0 \~~

-lgobject-2.0 \

-lws2_32 \

-lintl \

~~- -lgaim~~

+ -lgaim \

+ -lgtkgaim

~~-##~~

~~-## RULES~~

~~-##~~

+include $(GAIM_COMMON_RULES)

~~-# How to make a C file~~

~~-%.o: %.c~~

~~- $(CC) $(CFLAGS) $(INCLUDE_PATHS) $(DEFINES) -c $< -o $@~~

## TARGET DEFINITIONS

@@ -126,21 +117,14 @@

all: $(GF).dll

~~-install: all~~

~~- cp $(GF).dll $(DLL_INSTALL_DIR)~~

~~-##~~

~~-## BUILD Dependencies~~

~~-##~~

~~-$(GAIM_TOP)/src/gaim.lib:~~

~~- $(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib~~

+install: all $(GAIM_INSTALL_PLUGINS_DIR)

+ cp $(GF).dll $(GAIM_INSTALL_PLUGINS_DIR)

## BUILD DLL

~~-$(GF).dll: $(GF_OBJ) $(GAIM_TOP)/src/gaim.lib~~

+$(GF).dll: $(GAIM_GTKGAIM_DLL).a $(GF_OBJ)

$(CC) -shared $(GF_OBJ) $(LIB_PATHS) $(PLUGIN_LIBS) $(DLL_LD_FLAGS) -o $(GF).dll

@@ -149,5 +133,5 @@

clean:

~~- rm -rf *.o~~

~~- rm -rf $(GF).dll~~

+ rm -f *.o

+ rm -f $(GF).dll

~~--- a/src/gf_action.c Thu Sep 07 03:16:31 2006 -0400~~

+++ b/src/gf_action.c Mon Sep 18 00:49:27 2006 -0400

@@ -26,7 +26,7 @@

#include <gtkdialogs.h>

#include <gtklog.h>

#include <gtkpounce.h>

~~-#include <gtkstock.h>~~

+#include <gaimstock.h>

#include <gtkutils.h>

#include <plugin.h>

#include <version.h>

~~--- a/src/gf_preferences.c Thu Sep 07 03:16:31 2006 -0400~~

+++ b/src/gf_preferences.c Mon Sep 18 00:49:27 2006 -0400

@@ -589,7 +589,7 @@

command = g_strdup_printf("tar > /dev/null xzf %s -C %s", escaped, destdir);

g_free(escaped);

#else

~~- if(!wgaim_gz_untar(path, destdir)) {~~

+ if(!gtkwgaim_gz_untar(path, destdir)) {

g_free(destdir);

return;

}

~~--- a/themes/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/themes/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -8,7 +8,9 @@

MINI_THEME = ./mini

PENGUINS_THEME = ./Penguins

~~-install:~~

+.PHONY: install

+install:

$(MAKE) -C $(DEFAULT_THEME) -f Makefile.mingw install

$(MAKE) -C $(MINI_THEME) -f Makefile.mingw install

$(MAKE) -C $(PENGUINS_THEME) -f Makefile.mingw install

~~--- a/themes/Penguins/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/themes/Penguins/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -3,9 +3,15 @@

# Description: Makefile for guifications penguin theme

~~-GAIM_DATADIR = ../../../../win32-install-dir~~

+GAIM_TOP = ../../../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

+GAIM_DATADIR = $(GAIM_INSTALL_DIR)

include ./Makefile.am

+.PHONY: install

install:

if test '$(guificationspenguinstheme_DATA)'; then \

mkdir -p $(guificationspenguinsthemedir); \

~~--- a/themes/default/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/themes/default/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -3,9 +3,16 @@

# Description: Makefile for guifications default theme

~~-GAIM_DATADIR = ../../../../win32-install-dir~~

+GAIM_TOP = ../../../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

+GAIM_DATADIR = $(GAIM_INSTALL_DIR)

include ./Makefile.am

+.PHONY: install

install:

if test '$(guificationsdefaulttheme_DATA)'; then \

mkdir -p $(guificationsdefaultthemedir); \

~~--- a/themes/funky/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/themes/funky/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -3,11 +3,17 @@

# Description: Makefile for guifications test theme

~~-GAIM_DATADIR = ../../../../win32-install-dir~~

+GAIM_TOP = ../../../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

+GAIM_DATADIR = $(GAIM_INSTALL_DIR)

include ./Makefile.am

+.PHONY: install

install:

if test '$(guificationsfunkytheme_DATA)'; then \

mkdir -p $(guificationsfunkythemedir); \

cp $(guificationsfunkytheme_DATA) $(guificationsfunkythemedir); \

~~- fi;~~

+ fi;

~~--- a/themes/item_test/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/themes/item_test/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -3,9 +3,15 @@

# Description: Makefile for guifications test theme

~~-GAIM_DATADIR = ../../../../win32-install-dir~~

+GAIM_TOP = ../../../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

+GAIM_DATADIR = $(GAIM_INSTALL_DIR)

include ./Makefile.am

+.PHONY: install

install:

if test '$(guificationsitemtesttheme_DATA)'; then \

mkdir -p $(guificationsitemtestthemedir); \

~~--- a/themes/mini/Makefile.mingw Thu Sep 07 03:16:31 2006 -0400~~

+++ b/themes/mini/Makefile.mingw Mon Sep 18 00:49:27 2006 -0400

@@ -3,9 +3,15 @@

# Description: Makefile for guifications default theme

~~-GAIM_DATADIR = ../../../../win32-install-dir~~

+GAIM_TOP = ../../../../..

+include $(GAIM_TOP)/libgaim/win32/global.mak

+GAIM_DATADIR = $(GAIM_INSTALL_DIR)

include ./Makefile.am

+.PHONY: install

install:

if test '$(guificationsminitheme_DATA)'; then \

mkdir -p $(guificationsminithemedir); \