Using git add -p

Currently I’m working on changing the look of the dialogs in Empathy. So here is the problem. One button was not the same size as the other buttons because it had size group. I had to remove the size group to make that button look same as the others. That’s where the problem occured. Removing the size group made more changes to the file because of the version of Glade. Some important rows were also deleted, and some were added.


This how my patch look like:

Here is what I had to do:
* reset the patch
* see that your changes: git status
* type: git add -p and this will take you to this:

(following the instructions you can let the rows to stay changed or remove the rows that you didn’t change)
* when you have only the rows that you need you can make git commit
* format patch: git format-patch HEAD~1
And that’s it. You have what you need.  :)

Hello GOPW!

This is my first blog post for Gnome Women Outreach Program and my first blog post on Planet GNOME. I know that this post comes a “bit” late but I’ll try to write everything that I wanted to write one month ago. :)
First of all I should say how happy and pleased I am to be a part of this program, part of GNOME and I’m so glad that I have the chance to do what I like to do the most.
My project is Empathy and my mentor is Daniele Madeley. My initial contribution was about setting the proper status tooltip message in Empathy (there is a blog post waiting to be published about this). Daniele helped me a lot and I learned a lot from her. So Danni thanks a lot (hope I won’t disappoint you)!!! :)
So the plan is to start with some small bugs and then fix some others. The tasks that I’ll have later will depend of what is needed at that time.
I’ve learned a lot till now and I know that I still have more things to learn.
These days I’ll publish what I’ve been doing for the past month (so everything is not published in a day). :)

Building Empathy on Arch Linux with Gnome 3

After “killing” my Ubuntu I decided to install Arch Linux with Gnome 3 and start building Empathy.
But this time was very easy. I didn’t have any problem as I did the last time. Everything I needed I found on the wiki of Arch Linux (http://www.archlinux.org). I’m new to Arch Linux and it was a relief that this wiki has every information that I need. So here is how I did it:

I downloaded the PKGBUILD and empathy.install files from the wiki
( http://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/empathy), put them in a folder and open terminal. There you enter the folder and write makepkg.

Makepkg is used for compiling and building packages suitable for installation with pacman, Arch Linux’s package manager. makepkg is a script that automates the building of packages; it can download and validate source files, check dependencies, configure build-time settings, compile the sources, install into a temporary root, make customizations, generate meta-info, and package everything together.

So I after I wrote makepkg I’ve got the list of the missing dependencies. I only missed telepathy-farstream and libchamplan.

The next thing I did was to download the PKGBUILD files of these dependencies. Again open the folder in which you put the PKGBUILD file for the dependence that you want to build and open terminal, enter the folder and write makepkg. This also will give you the dependencies for the package.

If you are not missing anything, you have all the dependencies that you need, the package builds successfully, a package file (pkgname-pkgver.pkg.tar.xz) will be created in the working directory. To install it you should run (as root):

# pacman -U pkgname-pkgver.pkg.tar.xz

or instead of this you can use:

$ makepkg -i
(it has the same role).

After this in the folder where you have putted the PKGBUILD and empathy.install file and the
pkgname-pkgver.pkg.tar.xz file there will be new folders. In the src folder you can find the folder with the empathy code.

If you are makeing some changes to the code and want to compile it, everything you have to do is enter the src folder, than empathy and you can run the standard commands as ./configure, make, sudo make install.

One more thing if you already installed new dependencies and still doesn’t work all you have to do is to change the path with this command:

$export PKG_CONFIG_PATH=/usr/local/lib/pkg_config

the path should containt the place where you have installed the dependencies.

I’m so sorry that I don’t have screenshots to make this more understandable but I hope that this will be somehow useful. :)

Опсада на хаклаб “КИКА”

Дојде време и јас да си го активирам блогот. Не дека нема што да кажам ама се некако ја одолговлекував работата. Долго време блогот ми стоеше празен и неколку пати започнував да пишувам нешто и таман да објавам ќе се откажев. Па конечно најдов нешто што сметам дека вреди да биде прв пост на мојот блог.

И конечно еве нешто паметно од моја страна. First All Women Hacker Night во нашиот Хаклаб “КИКА”.

Идејата се појави пред одредено време кога на канал стана збор за жени девелопери од Остин, Тексас кои што си организирале една ваква собиранка. Па мојот одговор на тоа беше зошто не и ние.Услови имаме, па зошто и да не ги искористиме. Да… не нема во голем број во КИКА, но може да се потрудиме да се собереме барем на една вечер и да ја направиме продуктивна. Доволно е да имаме желба. Добредојден е секој кој сака да работи и го интересира нешто. Услови нема (освен нормално полот :D ). Може ова да го искористиме и како прилика да се презентира сето она за што се залага КИКА. Би биле добредојдени и оние кои едноставно ги интересира што се случува во онаа сива зграда на улица “Жележничка” каде се вее пиратското знаме. Ова би било добра прилика да си разменеме мислења и искуства меѓу себе. Да покажеме дека и ние може да поминеме една вечер покрај нашите компјутери правејќи нешто продуктивно, а не само во муабет и кафе. :)

Затоа предлагам на 13.07 (среда) да се собереме во просториите на хаклабот. Сите оние кои што ги интересира што е хаклаб КИКА, што се случува таму, активности и планови може да најдат повеќе информации на викито: http://wiki.spodeli.org. Сие што се заинтересирани може да ме контактирате мене на jovanka.gulicoska@gmail.com или на Тамара Атанасовска на маил tamara.atanasovska20@gmail.com

Девојки компјутерите во раце и да го завземеме хаклабот барем на една вечер. :)

UPDATE:

Почеток 18 часот

Настанот е објавен на facebook на:  http://www.facebook.com/event.php?eid=134730009941736 и на блогот на Слободен Софтвер Македонија http://b10g.spodeli.org/

А за оние кои не знаат каде се наоѓа: http:0.mk/f5d4//